From 6c04b82256a4eaf327cec0fb674f04d5e2b6dba7 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 29 Apr 2021 16:37:45 -0700 Subject: [PATCH] browser(firefox-beta): roll @ beta Apr 29, 2021 - v89.0b6 (#6368) --- browser_patches/firefox/BUILD_NUMBER | 4 ++-- browser_patches/firefox/UPSTREAM_CONFIG.sh | 2 +- browser_patches/firefox/patches/bootstrap.diff | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index 09ceb6eec1..18803223ca 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1249 -Changed: yurys@chromium.org Thu 29 Apr 2021 02:45:14 PM PDT +1250 +Changed: lushnikov@chromium.org Thu 29 Apr 2021 04:23:24 PM PDT diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh index 76dfb87942..57882d6c4c 100644 --- a/browser_patches/firefox/UPSTREAM_CONFIG.sh +++ b/browser_patches/firefox/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/mozilla/gecko-dev" BASE_BRANCH="beta" -BASE_REVISION="7d461bcf16aacecb0c798c52952d12574031cc16" +BASE_REVISION="7c424dea895bcf832b1da10f777c53e6a0c40515" diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff index 2c6fa202e8..b8b6b19452 100644 --- a/browser_patches/firefox/patches/bootstrap.diff +++ b/browser_patches/firefox/patches/bootstrap.diff @@ -92,7 +92,7 @@ index 4fa1d742bd5e0c03b1c93b8bf7cca2fcc8cbded1..1af645fdb86c4a803e1a5f0be08c1d09 DWORD creationFlags = CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT; diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn -index d34a1cfc86d41f1e597784b496ad9ddb86196365..f96b762065f37841f48c6d92bdec215e67c2d9f3 100644 +index e3f88b09d5259ebb3a0f2ef43fdf91df3ea01534..7827085030b4549cee46df9cae9b588f847b3455 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -65,6 +65,12 @@ browser/defaults/settings/main/example.json @@ -172,7 +172,7 @@ index 040c7b124dec6bb254563bbe74fe50012cb077a3..b4e6b8132786af70e8ad0dce88b67c28 const transportProvider = { setListener(upgradeListener) { diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp -index 6fdd14c5e3d5cf35d88728ba9c58ea102681eaf7..fdee095fccb786d441f9a9c92d763b7c18327dcd 100644 +index d99ddc3181cf9092633558ac5798f38860ad4f7d..6fbeec60b7ff51e5591c8e8c50e713bc9323603d 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -15,6 +15,12 @@ @@ -820,7 +820,7 @@ index ee93e6ecd9707d28485c72c6382ed492949f4982..56e5fd2c15c3d6e39d2bc85c5da4b54b // care of lowering the present active window. This happens in // a separate runnable to avoid touching multiple windows in diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp -index c299d88007d28d51448934734c6111d45e5b59a9..5f472793bf3d4381b6d6c37db940befa27f8c4db 100644 +index f1b9496cb8c7ebdaec68cec1774cd1b7f92ac88a..1e29eb18a89fafd8b9446eb5e94aa42b7f8f4ced 100644 --- a/dom/base/nsGlobalWindowOuter.cpp +++ b/dom/base/nsGlobalWindowOuter.cpp @@ -2458,7 +2458,7 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,