Skip to content

Commit

Permalink
browser(firefox): roll Firefox to roughly July, 15 (microsoft#3411)
Browse files Browse the repository at this point in the history
  • Loading branch information
aslushnikov committed Aug 12, 2020
1 parent 1ef199f commit 915902c
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 124 deletions.
4 changes: 2 additions & 2 deletions browser_patches/firefox/BUILD_NUMBER
@@ -1,2 +1,2 @@
1157
Changed: dgozman@gmail.com Tue Aug 11 14:21:42 PDT 2020
1158
Changed: lushnikov@chromium.org Wed Aug 12 09:56:07 PDT 2020
2 changes: 1 addition & 1 deletion browser_patches/firefox/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
REMOTE_URL="https://github.com/mozilla/gecko-dev"
BASE_BRANCH="beta"
BASE_REVISION="5e50c08b10c5d6d0acfa69ea87a4647519864a39"
BASE_REVISION="ac6e65d6e221ebad72dee20b8edabfc0fcb073c8"
4 changes: 2 additions & 2 deletions browser_patches/firefox/build.sh
Expand Up @@ -2,8 +2,8 @@
set -e
set +x

RUST_VERSION="1.42.0"
CBINDGEN_VERSION="0.14.1"
RUST_VERSION="1.45.0"
CBINDGEN_VERSION="0.14.3"

trap "cd $(pwd -P)" EXIT
cd "$(dirname $0)"
Expand Down
3 changes: 2 additions & 1 deletion browser_patches/firefox/juggler/components/juggler.js
Expand Up @@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const {ComponentUtils} = ChromeUtils.import("resource://gre/modules/ComponentUtils.jsm");
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
const {Dispatcher} = ChromeUtils.import("chrome://juggler/content/protocol/Dispatcher.js");
const {BrowserHandler} = ChromeUtils.import("chrome://juggler/content/protocol/BrowserHandler.js");
Expand Down Expand Up @@ -117,4 +118,4 @@ CommandLineHandler.prototype = {
helpInfo : " --juggler Enable Juggler automation\n"
};

var NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandLineHandler]);
var NSGetFactory = ComponentUtils.generateNSGetFactory([CommandLineHandler]);

0 comments on commit 915902c

Please sign in to comment.