Skip to content

Commit c5d3490

Browse files
authored
browser(firefox): roll firefox to beta Oct, 28 (#4274)
1 parent 7bedbb2 commit c5d3490

File tree

7 files changed

+79
-88
lines changed

7 files changed

+79
-88
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-
1196
2-
Changed: [email protected] Wed Oct 21 13:53:01 PDT 2020
1+
1197
2+
Changed: [email protected] Wed 28 Oct 2020 02:43:11 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="763b45bd9edb0073a2c6058dd3edc9254ec901e9"
3+
BASE_REVISION="5cae5aec70b8243880a632bd926210216bf0821a"

browser_patches/firefox/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33
set +x
44

55
RUST_VERSION="1.45.0"
6-
CBINDGEN_VERSION="0.14.3"
6+
CBINDGEN_VERSION="0.15.0"
77

88
trap "cd $(pwd -P)" EXIT
99
cd "$(dirname $0)"

browser_patches/firefox/juggler/TargetRegistry.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,8 @@ class PageTarget {
338338
onLocationChange: (aWebProgress, aRequest, aLocation) => this._onNavigated(aLocation),
339339
};
340340
this._eventListeners = [
341+
helper.addObserver(this._updateModalDialogs.bind(this), 'tabmodal-dialog-loaded'),
341342
helper.addProgressListener(tab.linkedBrowser, navigationListener, Ci.nsIWebProgress.NOTIFY_LOCATION),
342-
helper.addEventListener(this._linkedBrowser, 'DOMWillOpenModalDialog', async (event) => {
343-
// wait for the dialog to be actually added to DOM.
344-
await Promise.resolve();
345-
this._updateModalDialogs();
346-
}),
347343
helper.addEventListener(this._linkedBrowser, 'DOMModalDialogClosed', event => this._updateModalDialogs()),
348344
];
349345

browser_patches/firefox/juggler/moz.build

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
DIRS += ["components", "screencast", "pipe"]
66

77
JAR_MANIFESTS += ["jar.mn"]
8-
#JS_PREFERENCE_FILES += ["prefs/marionette.js"]
9-
10-
#MARIONETTE_UNIT_MANIFESTS += ["harness/marionette_harness/tests/unit/unit-tests.ini"]
11-
#XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
12-
138
with Files("**"):
149
BUG_COMPONENT = ("Testing", "Juggler")
1510

browser_patches/firefox/juggler/screencast/moz.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ XPCOM_MANIFESTS += [
2323
LOCAL_INCLUDES += [
2424
'/dom/media/systemservices',
2525
'/media/libyuv/libyuv/include',
26-
'/media/webrtc/trunk',
27-
'/media/webrtc/trunk/webrtc',
26+
'/third_party/libwebrtc',
27+
'/third_party/libwebrtc/webrtc',
2828
]
2929

3030
LOCAL_INCLUDES += [
@@ -43,7 +43,7 @@ SOURCES += [
4343
'WebMFileWriter.cpp',
4444
]
4545

46-
include('/media/webrtc/webrtc.mozbuild')
46+
include('/dom/media/webrtc/third_party_build/webrtc.mozbuild')
4747
include('/ipc/chromium/chromium-config.mozbuild')
4848

4949
FINAL_LIBRARY = 'xul'

browser_patches/firefox/patches/bootstrap.diff

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)