From 8c6faab012ae0af0ad58d23bdb752bf9ef186cee Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Thu, 6 Feb 2020 15:21:06 -0800
Subject: [PATCH] browser(firefox): roll firefox to upstream's beta (#876)

---
 browser_patches/firefox/BUILD_NUMBER           | 2 +-
 browser_patches/firefox/UPSTREAM_CONFIG.sh     | 2 +-
 browser_patches/firefox/patches/bootstrap.diff | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER
index b70608fe85..d7b1c440c0 100644
--- a/browser_patches/firefox/BUILD_NUMBER
+++ b/browser_patches/firefox/BUILD_NUMBER
@@ -1 +1 @@
-1023
+1024
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
index a0a99947de..ec40234afd 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="2b50ccdc8ad0c83966285352a875415a858037c2"
+BASE_REVISION="45ed8dabf41ef40c7dbeaf419f605d17f3fae044"
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index 6f590463c2..425f112ced 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -277,10 +277,10 @@ index 267856626bdf2e7411b4ac975d4f64b824c826a1..03b7a44b39b5b3303c2519614dd39863
 +  attribute boolean bypassCSPEnabled;
  };
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 30fcad1287506dea12d358d0f2a4bcd5103ceb0c..7f6fd045652d701b5f2e4b080642195f621bf6c8 100644
+index 9eac6924968638025556b8e97546ed3d91bfe28d..8839c880b75f00cb475bee7f68c48112e5263a1c 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -3249,6 +3249,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
+@@ -3267,6 +3267,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
  }
  
  void Document::ApplySettingsFromCSP(bool aSpeculative) {
@@ -290,7 +290,7 @@ index 30fcad1287506dea12d358d0f2a4bcd5103ceb0c..7f6fd045652d701b5f2e4b080642195f
    nsresult rv = NS_OK;
    if (!aSpeculative) {
      // 1) apply settings from regular CSP
-@@ -3298,6 +3301,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
+@@ -3316,6 +3319,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
      return NS_OK;
    }