From e87762a22497f21499c58bed3063e0c8c03f1718 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 17 Oct 2017 23:11:44 +0200 Subject: [PATCH] update for firefox 56.0.1 --- allow-anonymous-user-style.patch | 53 +++++++++ default.nix | 1 + disable-datasharing-infobar.patch | 12 +- disable-locationservice.patch | 4 +- disable-pocket.patch | 34 +++--- disable-reader.patch | 102 +++++++++++----- disable-sponsored-tiles.patch | 4 +- preferences.patch | 187 +++++++++++++++++++----------- 8 files changed, 277 insertions(+), 120 deletions(-) create mode 100644 allow-anonymous-user-style.patch diff --git a/allow-anonymous-user-style.patch b/allow-anonymous-user-style.patch new file mode 100644 index 0000000..f91d890 --- /dev/null +++ b/allow-anonymous-user-style.patch @@ -0,0 +1,53 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=285140 + +diff -r 57f68296c350 layout/style/nsStyleSet.cpp +--- a/layout/style/nsStyleSet.cpp Fri Sep 29 14:47:25 2017 -0700 ++++ b/layout/style/nsStyleSet.cpp Sat Sep 30 03:33:33 2017 +0200 +@@ -1124,9 +1124,7 @@ + bool haveImportantUARules = !aRuleWalker->GetCheckForImportantRules(); + + aRuleWalker->SetLevel(SheetType::User, false, true); +- bool skipUserStyles = +- aElement && aElement->IsInNativeAnonymousSubtree(); +- if (!skipUserStyles && mRuleProcessors[SheetType::User]) // NOTE: different ++ if (mRuleProcessors[SheetType::User]) // NOTE: different + (*aCollectorFunc)(mRuleProcessors[SheetType::User], aData); + nsRuleNode* lastUserRN = aRuleWalker->CurrentNode(); + bool haveImportantUserRules = !aRuleWalker->GetCheckForImportantRules(); +@@ -1144,7 +1142,7 @@ + static_cast(aData), + &cutOffInheritance); + } +- if (!skipUserStyles && !cutOffInheritance && // NOTE: different ++ if (!cutOffInheritance && // NOTE: different + mRuleProcessors[SheetType::Doc]) + (*aCollectorFunc)(mRuleProcessors[SheetType::Doc], aData); + nsRuleNode* lastDocRN = aRuleWalker->CurrentNode(); +@@ -1152,7 +1150,7 @@ + nsTArray lastScopedRNs; + nsTArray haveImportantScopedRules; + bool haveAnyImportantScopedRules = false; +- if (!skipUserStyles && !cutOffInheritance && ++ if (!cutOffInheritance && + aElement && aElement->IsElementInStyleScope()) { + lastScopedRNs.SetLength(mScopedDocSheetRuleProcessors.Length()); + haveImportantScopedRules.SetLength(mScopedDocSheetRuleProcessors.Length()); +@@ -1287,8 +1285,7 @@ + if (mRuleProcessors[SheetType::Agent]) + (*aFunc)(mRuleProcessors[SheetType::Agent], aData); + +- bool skipUserStyles = aData->mElement->IsInNativeAnonymousSubtree(); +- if (!skipUserStyles && mRuleProcessors[SheetType::User]) // NOTE: different ++ if (mRuleProcessors[SheetType::User]) // NOTE: different + (*aFunc)(mRuleProcessors[SheetType::User], aData); + + if (mRuleProcessors[SheetType::PresHint]) +@@ -1303,7 +1300,7 @@ + mBindingManager->WalkRules(aFunc, aData, &cutOffInheritance); + } + } +- if (!skipUserStyles && !cutOffInheritance) { ++ if (!cutOffInheritance) { + if (mRuleProcessors[SheetType::Doc]) // NOTE: different + (*aFunc)(mRuleProcessors[SheetType::Doc], aData); + if (aData->mElement->IsElementInStyleScope()) { diff --git a/default.nix b/default.nix index 8b65124..f9c8872 100644 --- a/default.nix +++ b/default.nix @@ -11,6 +11,7 @@ let patched = firefox.overrideDerivation (base: { patches = [ + ./allow-anonymous-user-style.patch ./disable-datasharing-infobar.patch ./disable-locationservice.patch ./disable-sponsored-tiles.patch diff --git a/disable-datasharing-infobar.patch b/disable-datasharing-infobar.patch index 3d299a0..92e0e89 100644 --- a/disable-datasharing-infobar.patch +++ b/disable-datasharing-infobar.patch @@ -1,12 +1,12 @@ --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -1636,9 +1636,6 @@ var gBrowserInit = { - // initialize the sync UI - gSync.init(); +@@ -1687,9 +1687,6 @@ + gSync.init(); + }, {timeout: 1000 * 5}); - if (AppConstants.MOZ_DATA_REPORTING) - gDataNotificationInfoBar.init(); - - gBrowserThumbnails.init(); - - gExtensionsNotifications.init(); + requestIdleCallback(() => { + // setup simple gestures support + gGestureSupport.init(true); diff --git a/disable-locationservice.patch b/disable-locationservice.patch index 36139c9..d732229 100644 --- a/disable-locationservice.patch +++ b/disable-locationservice.patch @@ -1,6 +1,6 @@ --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js -@@ -395,6 +395,10 @@ function migrateRegionPrefs() { +@@ -396,6 +396,10 @@ function migrateRegionPrefs() { return; } @@ -11,7 +11,7 @@ // If we have 'isUS' but no 'countryCode' then we are almost certainly // a profile from Fx 34/35 that set 'isUS' based purely on a timezone // check. If this said they were US, we force region to be US. -@@ -478,6 +482,10 @@ var ensureKnownCountryCode = async funct +@@ -479,6 +483,10 @@ var ensureKnownCountryCode = async funct // If we have a country-code already stored in our prefs we trust it. let countryCode = Services.prefs.getCharPref("browser.search.countryCode", ""); diff --git a/disable-pocket.patch b/disable-pocket.patch index c527269..c096fac 100644 --- a/disable-pocket.patch +++ b/disable-pocket.patch @@ -1,16 +1,6 @@ ---- a/browser/extensions/moz.build -+++ b/browser/extensions/moz.build -@@ -10,7 +10,6 @@ DIRS += [ - 'e10srollout', - 'followonsearch', - 'pdfjs', -- 'pocket', - 'screenshots', - 'shield-recipe-client', - 'webcompat', --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -200,7 +200,7 @@ pref("extensions.{972ce4c6-7e08-4474-a28 +@@ -204,7 +204,7 @@ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties"); pref("extensions.webextensions.themes.enabled", true); @@ -19,7 +9,7 @@ pref("lightweightThemes.update.enabled", true); pref("lightweightThemes.getMoreURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes"); -@@ -1630,8 +1630,6 @@ pref("browser.migrate.chrome.history.max +@@ -1656,8 +1656,6 @@ pref("browser.migrate.chrome.history.maxAgeInDays", 180); // Enable browser frames for use on desktop. Only exposed to chrome callers. pref("dom.mozBrowserFramesEnabled", true); @@ -30,7 +20,7 @@ // "Simplify Page" feature in Print Preview. This feature is disabled by default --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm -@@ -188,11 +188,6 @@ this.UITour = { +@@ -183,11 +183,6 @@ this.UITour = { aDocument.getElementById(buttonId) : null; } }], @@ -42,7 +32,7 @@ ["privateWindow", { query(aDocument) { let buttonId = gPhotonStructure ? "appMenu-private-window-button" -@@ -1363,45 +1358,6 @@ this.UITour = { +@@ -1367,45 +1362,6 @@ this.UITour = { popup.addEventListener("popupshown", onPopupShown); } aWindow.document.getElementById("identity-box").click(); @@ -85,6 +75,16 @@ - widgetWrapper.anchor, - placement.area); - }).catch(log.error); - } - }, - + } else if (aMenuName == "urlbar") { + this.getTarget(aWindow, "urlbar").then(target => { + let urlbar = target.node; +--- a/browser/extensions/moz.build ++++ b/browser/extensions/moz.build +@@ -13,7 +13,6 @@ DIRS += [ + 'formautofill', + 'onboarding', + 'pdfjs', +- 'pocket', + 'screenshots', + 'shield-recipe-client', + 'webcompat', diff --git a/disable-reader.patch b/disable-reader.patch index c10965d..69a2c78 100644 --- a/disable-reader.patch +++ b/disable-reader.patch @@ -1,24 +1,6 @@ ---- a/browser/base/content/browser.js -+++ b/browser/base/content/browser.js -@@ -71,7 +71,6 @@ XPCOMUtils.defineLazyGetter(this, "exten - ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], - ["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"], - ["ReaderMode", "resource://gre/modules/ReaderMode.jsm"], -- ["ReaderParent", "resource:///modules/ReaderParent.jsm"], - ["RecentWindow", "resource:///modules/RecentWindow.jsm"], - ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"], - ["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"], -@@ -4725,7 +4724,6 @@ var XULBrowserWindow = { - } - } - UpdateBackForwardCommands(gBrowser.webNavigation); -- ReaderParent.updateReaderButton(gBrowser.selectedBrowser); - - gGestureSupport.restoreRotationState(); - --- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc -@@ -48,7 +48,6 @@ +@@ -43,7 +43,6 @@ @@ -26,9 +8,44 @@ +@@ -284,7 +283,6 @@ + + + #endif +- + + + +--- a/browser/base/content/browser.js ++++ b/browser/base/content/browser.js +@@ -33,7 +33,6 @@ XPCOMUtils.defineLazyPreferenceGetter(this, "gPhotonStructure", + LoginManagerParent:false, NewTabUtils:false, PageThumbs:false, + PluralForm:false, PrivateBrowsingUtils:false, + ProcessHangMonitor:false, PromiseUtils:false, ReaderMode:false, +- ReaderParent:false, RecentWindow:false, SafeBrowsing: false, + SessionStore:false, + ShortcutUtils:false, SimpleServiceDiscovery:false, SitePermissions:false, + Social:false, TabCrashHandler:false, TelemetryStopwatch:false, +@@ -75,8 +74,6 @@ XPCOMUtils.defineLazyPreferenceGetter(this, "gPhotonStructure", + ["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"], + ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], + ["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"], +- ["ReaderMode", "resource://gre/modules/ReaderMode.jsm"], +- ["ReaderParent", "resource:///modules/ReaderParent.jsm"], + ["RecentWindow", "resource:///modules/RecentWindow.jsm"], + ["SafeBrowsing", "resource://gre/modules/SafeBrowsing.jsm"], + ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"], +@@ -4788,7 +4785,6 @@ var XULBrowserWindow = { + } + } + UpdateBackForwardCommands(gBrowser.webNavigation); +- ReaderParent.updateReaderButton(gBrowser.selectedBrowser); + + if (!gMultiProcessBrowser) // Bug 1108553 - Cannot rotate images with e10s + gGestureSupport.restoreRotationState(); --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul -@@ -902,10 +902,6 @@ +@@ -888,10 +888,6 @@ hidden="true" tooltiptext="&pageReportIcon.tooltip;" onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/> @@ -41,7 +58,15 @@ tooltip="dynamic-shortcut-tooltip" --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js -@@ -83,7 +83,6 @@ let initializedModules = {}; +@@ -37,7 +37,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing", + PageActions:false, + PageThumbs:false, PdfJs:false, PermissionUI:false, PlacesBackups:false, + PlacesUtils:false, PluralForm:false, PrivateBrowsingUtils:false, +- ProcessHangMonitor:false, ReaderParent:false, RecentWindow:false, + RemotePrompt:false, SessionStore:false, + ShellService:false, SimpleServiceDiscovery:false, TabCrashHandler:false, + UITour:false, UIState:false, UpdateListener:false, WebChannel:false, +@@ -89,7 +88,6 @@ let initializedModules = {}; ["PluralForm", "resource://gre/modules/PluralForm.jsm"], ["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"], ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], @@ -49,7 +74,7 @@ ["RecentWindow", "resource:///modules/RecentWindow.jsm"], ["RemotePrompt", "resource:///modules/RemotePrompt.jsm"], ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"], -@@ -156,9 +155,6 @@ const listeners = { +@@ -167,9 +165,6 @@ const listeners = { "FormValidation:ShowPopup": ["FormValidationHandler"], "FormValidation:HidePopup": ["FormValidationHandler"], "Prompt:Open": ["RemotePrompt"], @@ -61,7 +86,7 @@ "RemoteLogins:findRecipes": ["LoginManagerParent"], --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm -@@ -32,8 +32,6 @@ XPCOMUtils.defineLazyModuleGetter(this, +@@ -30,8 +30,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "ProfileAge", "resource://gre/modules/ProfileAge.jsm"); @@ -70,7 +95,23 @@ XPCOMUtils.defineLazyPreferenceGetter(this, "gPhotonStructure", "browser.photon.structure.enabled"); -@@ -663,15 +661,10 @@ this.UITour = { +@@ -40,7 +38,6 @@ const PREF_LOG_LEVEL = "browser.uitour.loglevel"; + const PREF_SEENPAGEIDS = "browser.uitour.seenPageIDs"; + + const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([ +- "forceShowReaderIcon", + "getConfiguration", + "getTreatmentTag", + "hideHighlight", +@@ -205,7 +202,6 @@ this.UITour = { + return aDocument.getElementById(buttonId); + } + }], +- ["readerMode-urlBar", {query: "#reader-mode-button"}], + ["search", { + infoPanelOffsetX: 18, + infoPanelPosition: "after_start", +@@ -664,15 +660,10 @@ this.UITour = { } case "forceShowReaderIcon": { @@ -88,7 +129,17 @@ --- a/browser/modules/moz.build +++ b/browser/modules/moz.build -@@ -150,7 +150,6 @@ +@@ -85,9 +85,6 @@ with Files("PluginContent.jsm"): + with Files("ProcessHangMonitor.jsm"): + BUG_COMPONENT = ("Core", "DOM: Content Processes") + +-with Files("ReaderParent.jsm"): +- BUG_COMPONENT = ("Toolkit", "Reader Mode") +- + with Files("Sanitizer.jsm"): + BUG_COMPONENT = ("Firefox", "Preferences") + +@@ -153,7 +150,6 @@ EXTRA_JS_MODULES += [ 'PermissionUI.jsm', 'PluginContent.jsm', 'ProcessHangMonitor.jsm', @@ -96,4 +147,3 @@ 'RecentWindow.jsm', 'RemotePrompt.jsm', 'Sanitizer.jsm', - diff --git a/disable-sponsored-tiles.patch b/disable-sponsored-tiles.patch index 65280d8..52034d4 100644 --- a/disable-sponsored-tiles.patch +++ b/disable-sponsored-tiles.patch @@ -57,7 +57,7 @@ }, /** -@@ -187,30 +153,6 @@ var DirectoryLinksProvider = { +@@ -187,30 +187,6 @@ * @return promise resolved immediately if no download needed, or upon completion */ _fetchAndCacheLinksIfNecessary: function DirectoryLinksProvider_fetchAndCacheLinksIfNecessary(forceDownload = false) { @@ -67,7 +67,7 @@ - } - - if (forceDownload || this._needsDownload) { -- this._downloadDeferred = Promise.defer(); +- this._downloadDeferred = PromiseUtils.defer(); - this._fetchAndCacheLinks(this._linksURL).then(() => { - // the new file was successfully downloaded and cached, so update a timestamp - this._lastDownloadMS = Date.now(); diff --git a/preferences.patch b/preferences.patch index 52772fe..0d342fb 100644 --- a/preferences.patch +++ b/preferences.patch @@ -1,7 +1,7 @@ --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -242,7 +242,7 @@ pref("general.autoScroll", true); - pref("browser.uidensity", 0); +@@ -255,7 +255,7 @@ pref("browser.touchmode.auto", false); + #endif // At startup, check if we're the default browser and prompt user if not. -pref("browser.shell.checkDefaultBrowser", true); @@ -9,7 +9,7 @@ pref("browser.shell.shortcutFavicons",true); pref("browser.shell.mostRecentDateSetAsDefault", ""); pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", true); -@@ -252,7 +252,7 @@ pref("browser.defaultbrowser.notificatio +@@ -265,7 +265,7 @@ pref("browser.defaultbrowser.notificationbar", false); // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore @@ -18,7 +18,7 @@ pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); // Whether we should skip the homepage when opening the first-run page pref("browser.startup.firstrunSkipsHomepage", true); -@@ -325,7 +325,7 @@ pref("browser.urlbar.suggest.history", +@@ -327,7 +327,7 @@ pref("browser.urlbar.suggest.history", pref("browser.urlbar.suggest.bookmark", true); pref("browser.urlbar.suggest.openpage", true); pref("browser.urlbar.suggest.searches", true); @@ -27,7 +27,7 @@ // The suggestion opt-in notification will be shown on 4 different days. pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4); pref("browser.urlbar.lastSuggestionsPromptDate", 20160601); -@@ -370,7 +370,7 @@ pref("browser.download.manager.resumeOnW +@@ -372,7 +372,7 @@ pref("browser.download.manager.resumeOnW pref("browser.download.animateNotifications", true); // This records whether or not the panel has been shown at least once. @@ -36,7 +36,7 @@ #ifndef XP_MACOSX pref("browser.helperApps.deleteTempFileOnExit", true); -@@ -453,7 +453,7 @@ pref("browser.photon.structure.enabled", +@@ -459,7 +459,7 @@ pref("browser.photon.structure.enabled", // Tabbed browser pref("browser.tabs.closeWindowWithLastTab", true); pref("browser.tabs.insertRelatedAfterCurrent", true); @@ -45,7 +45,7 @@ pref("browser.tabs.warnOnCloseOtherTabs", true); pref("browser.tabs.warnOnOpen", true); pref("browser.tabs.maxOpenBeforeWarn", 15); -@@ -630,7 +630,7 @@ pref("browser.xul.error_pages.enabled", +@@ -643,7 +643,7 @@ pref("browser.xul.error_pages.enabled", pref("browser.xul.error_pages.expert_bad_cert", false); // Enable captive portal detection. @@ -54,7 +54,7 @@ // If true, network link events will change the value of navigator.onLine pref("network.manage-offline-status", true); -@@ -1243,7 +1243,7 @@ pref("browser.newtab.preload", true); +@@ -1262,7 +1262,7 @@ pref("browser.newtab.preload", true); // Remembers if the about:newtab intro has been shown // NOTE: This preference is unused but was not removed in case // this information will be valuable in the future. @@ -87,7 +87,7 @@ #if MOZ_CRASHREPORTER --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -30,7 +30,7 @@ pref("general.useragent.site_specific_ov +@@ -31,7 +31,7 @@ pref("general.useragent.site_specific_ov pref("general.config.obscure_value", 13); // for MCD .cfg files @@ -96,27 +96,62 @@ // maximum number of dated backups to keep at any time pref("browser.bookmarks.max_backups", 5); -@@ -397,7 +397,7 @@ pref("media.opus.enabled", true); +@@ -411,7 +411,7 @@ pref("media.opus.enabled", true); pref("media.wave.enabled", true); pref("media.webm.enabled", true); -pref("media.eme.chromium-api.enabled", true); +pref("media.eme.chromium-api.enabled", false); - pref("media.eme.chromium-api.video-shmems", 4); + pref("media.eme.chromium-api.video-shmems", 6); #ifdef MOZ_APPLEMEDIA -@@ -468,8 +468,8 @@ pref("media.webrtc.debug.aec_dump_max_si - #ifdef MOZ_WIDGET_GONK - pref("media.navigator.video.default_width", 320); - pref("media.navigator.video.default_height", 240); +@@ -474,7 +474,7 @@ pref("media.navigator.video.use_tmmbr", false); + pref("media.navigator.audio.use_fec", true); + pref("media.navigator.video.red_ulpfec_enabled", false); + +-pref("media.peerconnection.dtmf.enabled", true); ++pref("media.peerconnection.dtmf.enabled", false); + + pref("media.webrtc.debug.trace_mask", 0); + pref("media.webrtc.debug.multi_log", false); +@@ -484,15 +484,15 @@ pref("media.webrtc.debug.aec_dump_max_size", 4194304); // 4MB + + pref("media.navigator.video.default_width",0); // adaptive default + pref("media.navigator.video.default_height",0); // adaptive default -pref("media.peerconnection.enabled", true); -pref("media.peerconnection.video.enabled", true); +pref("media.peerconnection.enabled", false); +pref("media.peerconnection.video.enabled", false); - pref("media.navigator.video.max_fs", 1200); // 640x480 == 1200mb - pref("media.navigator.video.max_fr", 30); - pref("media.navigator.video.h264.level", 12); // 0x42E00C - level 1.2 -@@ -1331,7 +1331,7 @@ pref("privacy.donottrackheader.enabled", + pref("media.navigator.video.max_fs", 12288); // Enough for 2048x1536 + pref("media.navigator.video.max_fr", 60); + pref("media.navigator.video.h264.level", 31); // 0x42E01f - level 3.1 + pref("media.navigator.video.h264.max_br", 0); + pref("media.navigator.video.h264.max_mbps", 0); + pref("media.peerconnection.video.h264_enabled", false); +-pref("media.peerconnection.video.vp9_enabled", true); ++pref("media.peerconnection.video.vp9_enabled", false); + pref("media.getusermedia.aec", 1); + pref("media.getusermedia.browser.enabled", false); + pref("media.getusermedia.channels", 0); +@@ -514,7 +514,7 @@ pref("media.peerconnection.ice.link_local", false); // Set only for testing IPV6 + pref("media.peerconnection.ice.force_interface", ""); // Limit to only a single interface + pref("media.peerconnection.ice.relay_only", false); // Limit candidates to TURN + pref("media.peerconnection.use_document_iceservers", true); +-pref("media.peerconnection.identity.enabled", true); ++pref("media.peerconnection.identity.enabled", false); + pref("media.peerconnection.identity.timeout", 10000); + pref("media.peerconnection.ice.stun_client_maximum_transmits", 7); + pref("media.peerconnection.ice.trickle_grace_period", 5000); +@@ -525,7 +525,7 @@ pref("media.peerconnection.ice.proxy_only", false); + // These values (aec, agc, and noice) are from media/webrtc/trunk/webrtc/common_types.h + // kXxxUnchanged = 0, kXxxDefault = 1, and higher values are specific to each + // setting (for Xxx = Ec, Agc, or Ns). Defaults are all set to kXxxDefault here. +-pref("media.peerconnection.turn.disable", false); ++pref("media.peerconnection.turn.disable", true); + #if defined(MOZ_WEBRTC_HARDWARE_AEC_NS) + pref("media.getusermedia.aec_enabled", false); + pref("media.getusermedia.noise_enabled", false); +@@ -1386,7 +1386,7 @@ pref("privacy.donottrackheader.enabled", // the popup will be called when the popup is dismissed. pref("privacy.permissionPrompts.showCloseButton", false); // Enforce tracking protection in all modes @@ -125,7 +160,7 @@ // Enforce tracking protection in Private Browsing mode pref("privacy.trackingprotection.pbmode.enabled", true); // Annotate channels based on the tracking protection list in all modes -@@ -1641,7 +1641,7 @@ pref("network.http.network-changed.timeo +@@ -1700,7 +1700,7 @@ pref("network.http.network-changed.timeo // The maximum number of current global half open sockets allowable // when starting a new speculative connection. @@ -134,7 +169,7 @@ // Whether or not to block requests for non head js/css items (e.g. media) // while those elements load. -@@ -1949,7 +1949,7 @@ pref("network.dns.get-ttl", true); +@@ -2014,7 +2014,7 @@ pref("network.dns.get-ttl", true); pref("network.dnsCacheExpirationGracePeriod", 60); // This preference can be used to turn off DNS prefetch. @@ -143,16 +178,16 @@ // This preference controls whether .onion hostnames are // rejected before being given to DNS. RFC 7686 -@@ -1983,7 +1983,7 @@ pref("network.ftp.idleConnectionTimeout" - pref("network.dir.format", 2); +@@ -2053,7 +2053,7 @@ pref("network.dir.format", 2); - // enables the prefetch service (i.e., prefetching of URLs). + // enables the prefetch service (i.e., prefetching of and + // URLs). -pref("network.prefetch-next", true); +pref("network.prefetch-next", false); - - // enables the predictive service - pref("network.predictor.enabled", true); -@@ -2474,7 +2474,7 @@ pref("security.allow_chrome_frames_insid + // enables the preloading (i.e., preloading of URLs). + pref("network.preload", true); + +@@ -2558,7 +2558,7 @@ pref("security.allow_chrome_frames_insid pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1"); // Blocklist preferences @@ -161,7 +196,7 @@ // OneCRL freshness checking depends on this value, so if you change it, // please also update security.onecrl.maximum_staleness_in_seconds. pref("extensions.blocklist.interval", 86400); -@@ -4090,7 +4090,7 @@ pref("browser.drag_out_of_frame_style", +@@ -4162,7 +4162,7 @@ pref("browser.drag_out_of_frame_style", // Middle-mouse handling pref("middlemouse.paste", true); @@ -170,7 +205,7 @@ pref("middlemouse.openNewWindow", true); pref("middlemouse.scrollbarPosition", true); -@@ -4153,7 +4153,7 @@ pref("browser.drag_out_of_frame_style", +@@ -4225,7 +4225,7 @@ pref("browser.drag_out_of_frame_style", // Middle-mouse handling pref("middlemouse.paste", true); @@ -179,7 +214,7 @@ pref("middlemouse.openNewWindow", true); pref("middlemouse.scrollbarPosition", true); -@@ -4511,7 +4511,7 @@ pref("signon.masterPasswordReprompt.time +@@ -4583,7 +4583,7 @@ pref("signon.masterPasswordReprompt.time // Satchel (Form Manager) prefs pref("browser.formfill.debug", false); @@ -188,8 +223,8 @@ pref("browser.formfill.expire_days", 180); pref("browser.formfill.agedWeight", 2); pref("browser.formfill.bucketSize", 1); -@@ -4618,7 +4618,7 @@ pref("gl.multithreaded", true); - pref("gl.ignore-dx-interop2-blacklist", false); +@@ -4695,7 +4695,7 @@ pref("gl.ignore-dx-interop2-blacklist", false); + pref("gl.use-tls-is-current", 0); pref("webgl.force-enabled", false); -pref("webgl.disabled", false); @@ -197,8 +232,8 @@ pref("webgl.disable-angle", false); pref("webgl.disable-wgl", false); pref("webgl.min_capability_mode", false); -@@ -4832,13 +4832,13 @@ pref("layers.gralloc.disable", false); - pref("webrender.highlight-painted-layers", false); +@@ -4909,13 +4909,13 @@ pref("layers.force-active", false); + pref("layers.gralloc.disable", false); // Enable/Disable the geolocation API for content -pref("geo.enabled", true); @@ -213,7 +248,7 @@ // Enable/Disable the device storage API for content pref("device.storage.enabled", false); -@@ -4950,7 +4950,7 @@ pref("dom.vibrator.max_vibrate_ms", 1000 +@@ -5029,7 +5029,7 @@ pref("dom.vibrator.max_vibrate_ms", 1000 pref("dom.vibrator.max_vibrate_list_len", 128); // Battery API @@ -222,7 +257,7 @@ // Push -@@ -5102,8 +5102,8 @@ pref("social.directories", "https://acti +@@ -5181,8 +5181,8 @@ pref("social.directories", "https://acti // remote-install allows any website to activate a provider, with extended UI // notifying user of installation. we can later pref off remote install if // necessary. This does not affect whitelisted and directory installs. @@ -233,42 +268,34 @@ // Disable idle observer fuzz, because only privileged content can access idle // observers (bug 780507). -@@ -5241,26 +5241,26 @@ pref("dom.flyweb.enabled", false); +@@ -5320,21 +5320,15 @@ pref("dom.flyweb.enabled", false); pref("dom.mapped_arraybuffer.enabled", true); // The tables used for Safebrowsing phishing and malware checks. -pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple"); +pref("urlclassifier.malwareTable", ""); - #ifdef MOZILLA_OFFICIAL - // In the official build, we are allowed to use google's private - // phishing list "goog-phish-shavar". See Bug 1288840. +-#ifdef MOZILLA_OFFICIAL +-// In the official build, we are allowed to use google's private +-// phishing list "goog-phish-shavar". See Bug 1288840. -pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple"); -+pref("urlclassifier.phishTable", ""); - #else +-#else -pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple"); +-#endif +pref("urlclassifier.phishTable", ""); - #endif // Tables for application reputation. - #ifdef NIGHTLY_BUILD --pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256,goog-downloadwhite-proto"); --pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar,goog-badbinurl-proto"); -+pref("urlclassifier.downloadAllowTable", ""); -+pref("urlclassifier.downloadBlockTable", ""); - #else -pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256"); -pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar"); +pref("urlclassifier.downloadAllowTable", ""); +pref("urlclassifier.downloadBlockTable", ""); - #endif // NIGHTLY_BUILD --pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-block-simple,test-flashallow-simple,testexcept-flashallow-simple,test-flash-simple,testexcept-flash-simple,test-flashsubdoc-simple,testexcept-flashsubdoc-simple,goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,except-flashinfobar-digest256"); +-pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-block-simple,goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,except-flashinfobar-digest256"); +pref("urlclassifier.disallow_completions", ""); // The table and update/gethash URLs for Safebrowsing phishing and malware // checks. -@@ -5282,55 +5282,55 @@ pref("urlclassifier.update.timeout_ms", +@@ -5356,58 +5350,54 @@ pref("urlclassifier.update.timeout_ms", 90000); pref("urlclassifier.alternate_error_page", "blocked"); // Enable phishing protection @@ -279,9 +306,12 @@ -pref("browser.safebrowsing.malware.enabled", true); +pref("browser.safebrowsing.malware.enabled", false); +-#ifdef MOZILLA_OFFICIAL -pref("browser.safebrowsing.downloads.enabled", true); +-#else + pref("browser.safebrowsing.downloads.enabled", false); +-#endif -pref("browser.safebrowsing.downloads.remote.enabled", true); -+pref("browser.safebrowsing.downloads.enabled", false); +pref("browser.safebrowsing.downloads.remote.enabled", false); pref("browser.safebrowsing.downloads.remote.timeout_ms", 10000); pref("browser.safebrowsing.downloads.remote.url", "https://sb-ssl.google.com/safebrowsing/clientreport/download?key=%GOOGLE_API_KEY%"); @@ -303,32 +333,35 @@ -pref("browser.safebrowsing.provider.google.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url="); -pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url="); +-pref("browser.safebrowsing.provider.google.advisoryURL", "https://developers.google.com/safe-browsing/v4/advisory"); +-pref("browser.safebrowsing.provider.google.advisoryName", "Google Safe Browsing."); +pref("browser.safebrowsing.provider.google.lists", ""); +pref("browser.safebrowsing.provider.google.updateURL", ""); +pref("browser.safebrowsing.provider.google.gethashURL", ""); +pref("browser.safebrowsing.provider.google.reportURL", ""); +pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", ""); +pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", ""); - ++pref("browser.safebrowsing.provider.google.advisoryURL", ""); ++pref("browser.safebrowsing.provider.google.advisoryName", ""); // Prefs for v4. pref("browser.safebrowsing.provider.google4.pver", "4"); -pref("browser.safebrowsing.provider.google4.lists", "goog-badbinurl-proto,goog-downloadwhite-proto,goog-phish-proto,googpub-phish-proto,goog-malware-proto,goog-unwanted-proto"); -pref("browser.safebrowsing.provider.google4.updateURL", "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST"); -+pref("browser.safebrowsing.provider.google4.lists", ""); -+pref("browser.safebrowsing.provider.google4.updateURL", ""); - #ifdef NIGHTLY_BUILD -pref("browser.safebrowsing.provider.google4.gethashURL", "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST"); -+pref("browser.safebrowsing.provider.google4.gethashURL", ""); - #else - pref("browser.safebrowsing.provider.google4.gethashURL", ""); - #endif // NIGHTLY_BUILD -pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url="); -pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url="); +-pref("browser.safebrowsing.provider.google4.advisoryURL", "https://developers.google.com/safe-browsing/v4/advisory"); +-pref("browser.safebrowsing.provider.google4.advisoryName", "Google Safe Browsing."); ++pref("browser.safebrowsing.provider.google4.lists", ""); ++pref("browser.safebrowsing.provider.google4.updateURL", ""); ++pref("browser.safebrowsing.provider.google4.gethashURL", ""); +pref("browser.safebrowsing.provider.google4.reportURL", ""); +pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", ""); +pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", ""); ++pref("browser.safebrowsing.provider.google4.advisoryURL", ""); ++pref("browser.safebrowsing.provider.google4.advisoryName", ""); -pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url="); +pref("browser.safebrowsing.reportPhishURL", ""); @@ -350,7 +383,28 @@ // Set to a date in the past to force immediate download in new profiles. pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1"); // Block lists for tracking protection. The name values will be used as the keys -@@ -5428,10 +5428,10 @@ pref("dom.wakelock.enabled", false); +@@ -5417,13 +5407,13 @@ pref("browser.safebrowsing.provider.mozilla.lists.base.description", "mozstdDesc + pref("browser.safebrowsing.provider.mozilla.lists.content.name", "mozfullName"); + pref("browser.safebrowsing.provider.mozilla.lists.content.description", "mozfullDesc2"); + +-pref("urlclassifier.flashAllowTable", "allow-flashallow-digest256"); +-pref("urlclassifier.flashAllowExceptTable", "except-flashallow-digest256"); +-pref("urlclassifier.flashTable", "block-flash-digest256"); +-pref("urlclassifier.flashExceptTable", "except-flash-digest256"); +-pref("urlclassifier.flashSubDocTable", "block-flashsubdoc-digest256"); +-pref("urlclassifier.flashSubDocExceptTable", "except-flashsubdoc-digest256"); +-pref("urlclassifier.flashInfobarTable", "except-flashinfobar-digest256"); ++pref("urlclassifier.flashAllowTable", ""); ++pref("urlclassifier.flashAllowExceptTable", ""); ++pref("urlclassifier.flashTable", ""); ++pref("urlclassifier.flashExceptTable", ""); ++pref("urlclassifier.flashSubDocTable", ""); ++pref("urlclassifier.flashSubDocExceptTable", ""); ++pref("urlclassifier.flashInfobarTable", ""); + + pref("plugins.http_https_only", true); + pref("plugins.flashBlock.enabled", false); +@@ -5499,10 +5499,10 @@ pref("dom.wakelock.enabled", false); // The URL of the Firefox Accounts auth server backend pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1"); @@ -363,7 +417,7 @@ // SW Cache API -@@ -5484,7 +5484,7 @@ pref("browser.search.suggest.enabled", t +@@ -5546,7 +5546,7 @@ pref("browser.search.suggest.enabled", t pref("browser.search.reset.enabled", false); pref("browser.search.reset.whitelist", ""); pref("browser.search.geoSpecificDefaults", false); @@ -372,7 +426,7 @@ pref("browser.search.geoip.timeout", 3000); #ifdef MOZ_OFFICIAL_BRANDING -@@ -5499,7 +5499,7 @@ pref("browser.search.official", true); +@@ -5560,7 +5560,7 @@ pref("browser.search.official", true); //pref("media.gmp-manager.url.override", ""); // Update service URL for GMP install/updates: @@ -381,7 +435,7 @@ // When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the // final certificate and all certificates the connection is redirected to before -@@ -5524,15 +5524,15 @@ pref("media.gmp-manager.cert.requireBuil +@@ -5585,14 +5585,14 @@ pref("media.gmp-manager.cert.requireBuiltIn", true); // IMPORTANT! app.update.certs.* prefs should also be updated if these // are updated. pref("media.gmp-manager.cert.checkAttributes", true); @@ -393,7 +447,6 @@ +pref("media.gmp-manager.certs.1.commonName", ""); +pref("media.gmp-manager.certs.2.issuerName", ""); +pref("media.gmp-manager.certs.2.commonName", ""); - #endif // Whether or not to perform reader mode article parsing on page load. // If this pref is disabled, we will never show a reader mode icon in the toolbar.