Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(firefox): roll firefox to upstream's beta (#876)

Browse source
This commit is contained in:
Andrey Lushnikov 2020-02-06 15:21:06 -08:00 committed by GitHub
parent 99d06892c5
commit 8c6faab012
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/firefox/BUILD_NUMBER
View file

@ -1 +1 @@
1023 1024

2
browser_patches/firefox/UPSTREAM_CONFIG.sh
View file

@ -1,3 +1,3 @@
REMOTE_URL="https://github.com/mozilla/gecko-dev" REMOTE_URL="https://github.com/mozilla/gecko-dev"
BASE_BRANCH="beta" BASE_BRANCH="beta"
BASE_REVISION="2b50ccdc8ad0c83966285352a875415a858037c2" BASE_REVISION="45ed8dabf41ef40c7dbeaf419f605d17f3fae044"

6
browser_patches/firefox/patches/bootstrap.diff
View file

@ -277,10 +277,10 @@ index 267856626bdf2e7411b4ac975d4f64b824c826a1..03b7a44b39b5b3303c2519614dd39863
+ attribute boolean bypassCSPEnabled; + attribute boolean bypassCSPEnabled;
}; };
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp 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 --- a/dom/base/Document.cpp
+++ b/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) { void Document::ApplySettingsFromCSP(bool aSpeculative) {
@ -290,7 +290,7 @@ index 30fcad1287506dea12d358d0f2a4bcd5103ceb0c..7f6fd045652d701b5f2e4b080642195f
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (!aSpeculative) { if (!aSpeculative) {
// 1) apply settings from regular CSP // 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; return NS_OK;
} }