Skip to content

Commit 6c04b82

Browse files
authored
browser(firefox-beta): roll @ beta Apr 29, 2021 - v89.0b6 (#6368)
1 parent 0abcaf0 commit 6c04b82

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

browser_patches/firefox/BUILD_NUMBER

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1249
2-
Changed: yurys@chromium.org Thu 29 Apr 2021 02:45:14 PM PDT
1+
1250
2+
Changed: lushnikov@chromium.org Thu 29 Apr 2021 04:23:24 PM PDT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
REMOTE_URL="https://github.com/mozilla/gecko-dev"
22
BASE_BRANCH="beta"
3-
BASE_REVISION="7d461bcf16aacecb0c798c52952d12574031cc16"
3+
BASE_REVISION="7c424dea895bcf832b1da10f777c53e6a0c40515"

browser_patches/firefox/patches/bootstrap.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ index 4fa1d742bd5e0c03b1c93b8bf7cca2fcc8cbded1..1af645fdb86c4a803e1a5f0be08c1d09
9292
DWORD creationFlags = CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT;
9393

9494
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
95-
index d34a1cfc86d41f1e597784b496ad9ddb86196365..f96b762065f37841f48c6d92bdec215e67c2d9f3 100644
95+
index e3f88b09d5259ebb3a0f2ef43fdf91df3ea01534..7827085030b4549cee46df9cae9b588f847b3455 100644
9696
--- a/browser/installer/allowed-dupes.mn
9797
+++ b/browser/installer/allowed-dupes.mn
9898
@@ -65,6 +65,12 @@ browser/defaults/settings/main/example.json
@@ -172,7 +172,7 @@ index 040c7b124dec6bb254563bbe74fe50012cb077a3..b4e6b8132786af70e8ad0dce88b67c28
172172
const transportProvider = {
173173
setListener(upgradeListener) {
174174
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
175-
index 6fdd14c5e3d5cf35d88728ba9c58ea102681eaf7..fdee095fccb786d441f9a9c92d763b7c18327dcd 100644
175+
index d99ddc3181cf9092633558ac5798f38860ad4f7d..6fbeec60b7ff51e5591c8e8c50e713bc9323603d 100644
176176
--- a/docshell/base/nsDocShell.cpp
177177
+++ b/docshell/base/nsDocShell.cpp
178178
@@ -15,6 +15,12 @@
@@ -820,7 +820,7 @@ index ee93e6ecd9707d28485c72c6382ed492949f4982..56e5fd2c15c3d6e39d2bc85c5da4b54b
820820
// care of lowering the present active window. This happens in
821821
// a separate runnable to avoid touching multiple windows in
822822
diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
823-
index c299d88007d28d51448934734c6111d45e5b59a9..5f472793bf3d4381b6d6c37db940befa27f8c4db 100644
823+
index f1b9496cb8c7ebdaec68cec1774cd1b7f92ac88a..1e29eb18a89fafd8b9446eb5e94aa42b7f8f4ced 100644
824824
--- a/dom/base/nsGlobalWindowOuter.cpp
825825
+++ b/dom/base/nsGlobalWindowOuter.cpp
826826
@@ -2458,7 +2458,7 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,

0 commit comments

Comments
 (0)