rnhmjoj/firefox-patches
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update for firefox 57

Browse Source
This commit is contained in:
Michele Guerini Rocco 2017-11-20 20:14:25 +01:00 committed by rnhmjoj
parent 9608e17aa3
commit 14b80b7c70
11 changed files with 1040 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
allow-anonymous-user-style.patch
View File

@ -2,7 +2,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=285140
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -1124,9 +1124,7 @@
@@ -1125,9 +1125,7 @@
bool haveImportantUARules = !aRuleWalker->GetCheckForImportantRules();
aRuleWalker->SetLevel(SheetType::User, false, true);
@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=285140
(*aCollectorFunc)(mRuleProcessors[SheetType::User], aData);
nsRuleNode* lastUserRN = aRuleWalker->CurrentNode();
bool haveImportantUserRules = !aRuleWalker->GetCheckForImportantRules();
@@ -1144,7 +1142,7 @@
@@ -1145,7 +1143,7 @@
static_cast<ElementDependentRuleProcessorData*>(aData),
&cutOffInheritance);
}
@ -22,7 +22,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=285140
mRuleProcessors[SheetType::Doc])
(*aCollectorFunc)(mRuleProcessors[SheetType::Doc], aData);
nsRuleNode* lastDocRN = aRuleWalker->CurrentNode();
@@ -1152,7 +1150,7 @@
@@ -1153,7 +1151,7 @@
nsTArray<nsRuleNode*> lastScopedRNs;
nsTArray<bool> haveImportantScopedRules;
bool haveAnyImportantScopedRules = false;
@ -31,7 +31,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=285140
aElement && aElement->IsElementInStyleScope()) {
lastScopedRNs.SetLength(mScopedDocSheetRuleProcessors.Length());
haveImportantScopedRules.SetLength(mScopedDocSheetRuleProcessors.Length());
@@ -1287,8 +1285,7 @@
@@ -1288,8 +1286,7 @@
if (mRuleProcessors[SheetType::Agent])
(*aFunc)(mRuleProcessors[SheetType::Agent], aData);
@ -41,7 +41,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=285140
(*aFunc)(mRuleProcessors[SheetType::User], aData);
if (mRuleProcessors[SheetType::PresHint])
@@ -1303,7 +1300,7 @@
@@ -1304,7 +1301,7 @@
mBindingManager->WalkRules(aFunc, aData, &cutOffInheritance);
}
}
@ -50,3 +50,4 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=285140
if (mRuleProcessors[SheetType::Doc]) // NOTE: different
(*aFunc)(mRuleProcessors[SheetType::Doc], aData);
if (aData->mElement->IsElementInStyleScope()) {
f (aData->mElement->IsElementInStyleScope()) {

14
default.nix
View File

@ -5,7 +5,6 @@ let
gtk3Support = true;
enableOfficialBranding = true;
privacySupport = true;
geolocationSupport = false;
pulseaudioSupport = false;
};
@ -15,15 +14,20 @@ let
./disable-datasharing-infobar.patch
./disable-locationservice.patch
./disable-sponsored-tiles.patch
./disable-system-addons.patch
./disable-telemetry.patch
./disable-reader.patch
./disable-pocket.patch
./disable-send-to-device.patch
./disable-dbus.patch
./preferences.patch
];
postPatch = ''
sed -e '/browser\/extensions/d' \
-e '/browser\/features/d' \
-e '/pdfjs/d' \
sed -e '/browser\/extensions/d' \
-e '/browser\/components\/Experiments/d' \
-e '/browser\/features/d' \
-e '/pdfjs/d' \
-i browser/installer/package-manifest.in
: > browser/extensions/moz.build
'';
@ -31,7 +35,7 @@ let
"--disable-dbus"
"--disable-gconf"
"--disable-eme"
];
];
});
in

13
disable-datasharing-infobar.patch
View File

@ -1,12 +1,11 @@
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1687,9 +1687,6 @@
gSync.init();
}, {timeout: 1000 * 5});
@@ -1548,9 +1548,6 @@
MenuTouchModeObserver.init();
}
- if (AppConstants.MOZ_DATA_REPORTING)
- gDataNotificationInfoBar.init();
-
requestIdleCallback(() => {
// setup simple gestures support
gGestureSupport.init(true);
if (!AppConstants.MOZILLA_OFFICIAL)
DevelopmentHelpers.init();

38
disable-dbus.patch Normal file
View File

@ -0,0 +1,38 @@
--- a/ipc/moz.build
+++ b/ipc/moz.build
@@ -11,9 +11,6 @@
'testshell',
]
-if CONFIG['MOZ_ENABLE_DBUS']:
- DIRS += ['dbus']
-
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
DIRS += ['contentproc']
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -27,10 +27,7 @@
if CONFIG['MOZ_SCTP']:
DIRS += ['sctp/src', 'sctp/datachannel']
-if CONFIG['NECKO_WIFI']:
- DIRS += ['wifi']
-
DIRS += ['locales']
DIRS += ['build']
TEST_DIRS += ['test']
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -60,6 +60,10 @@
ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release
MAR_CHANNEL_ID=firefox-mozilla-release
fi
+MOZ_ENABLE_DBUS=0
+NECKO_WIFI=0
+NECKO_WIFI_DBUS=0
+
MOZ_PROFILE_MIGRATOR=1
# Enable checking that add-ons are signed by the trusted root

4
disable-locationservice.patch
View File

@ -1,6 +1,6 @@
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -396,6 +396,10 @@ function migrateRegionPrefs() {
@@ -380,6 +380,10 @@
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.
@@ -479,6 +483,10 @@ var ensureKnownCountryCode = async funct
@@ -463,6 +467,10 @@
// If we have a country-code already stored in our prefs we trust it.
let countryCode = Services.prefs.getCharPref("browser.search.countryCode", "");

80
disable-pocket.patch
View File

@ -1,6 +1,6 @@
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -204,7 +204,7 @@ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser
@@ -200,7 +200,7 @@
pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
pref("extensions.webextensions.themes.enabled", true);
@ -9,7 +9,7 @@
pref("lightweightThemes.update.enabled", true);
pref("lightweightThemes.getMoreURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes");
@@ -1656,8 +1656,6 @@ pref("browser.migrate.chrome.history.maxAgeInDays", 180);
@@ -1648,8 +1648,6 @@
// Enable browser frames for use on desktop. Only exposed to chrome callers.
pref("dom.mozBrowserFramesEnabled", true);
@ -20,67 +20,41 @@
// "Simplify Page" feature in Print Preview. This feature is disabled by default
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -183,11 +183,6 @@ this.UITour = {
aDocument.getElementById(buttonId) : null;
}
}],
@@ -147,18 +147,6 @@
["help", {query: "#appMenu-help-button"}],
["home", {query: "#home-button"}],
["library", {query: "#appMenu-library-button"}],
- ["pocket", {
- allowAdd: true,
- query: "#pocket-button",
- widgetName: "pocket-button",
- query: (aDocument) => {
- // The pocket's urlbar page action button is pre-defined in the DOM.
- // It would be hidden if toggled off from the urlbar.
- let node = aDocument.getElementById("pocket-button-box");
- if (node && node.hidden == false) {
- return node;
- }
- return aDocument.getElementById("pageAction-panel-pocket");
- },
- }],
["privateWindow", {
query(aDocument) {
let buttonId = gPhotonStructure ? "appMenu-private-window-button"
@@ -1367,45 +1362,6 @@ this.UITour = {
popup.addEventListener("popupshown", onPopupShown);
["privateWindow", {query: "#appMenu-private-window-button"}],
["quit", {query: "#appMenu-quit-button"}],
["search", {
@@ -1427,12 +1415,6 @@
}
aWindow.document.getElementById("identity-box").click();
- } else if (aMenuName == "pocket") {
- this.getTarget(aWindow, "pocket").then(async function onPocketTarget(target) {
- let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName);
- if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) {
- log.error("Can't open the pocket menu without a view");
- return;
- }
- let placement = CustomizableUI.getPlacementOfWidget(target.widgetName);
- if (!placement || !placement.area) {
- log.error("Can't open the pocket menu without a placement");
- return;
- }
-
- if (placement.area == CustomizableUI.AREA_PANEL) {
- // Open the appMenu and wait for it if it's not already opened or showing a subview.
- await new Promise((resolve, reject) => {
- if (aWindow.PanelUI.panel.state != "closed") {
- if (aWindow.PanelUI.multiView.showingSubView) {
- reject("A subview is already showing");
- return;
- }
-
- resolve();
- return;
- }
-
- aWindow.PanelUI.panel.addEventListener("popupshown", function() {
- resolve();
- }, {once: true});
-
- aWindow.PanelUI.show();
- });
- }
-
- let widgetWrapper = widgetGroupWrapper.forWindow(aWindow);
- aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId,
- widgetWrapper.anchor,
- placement.area);
- }).catch(log.error);
} else if (aMenuName == "pocket") {
- let pageAction = PageActions.actionForID("pocket");
- if (!pageAction) {
- log.error("Can't open the pocket menu without a page action");
- return;
- }
- pageAction.doCommand(aWindow);
} 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 += [
@@ -12,7 +12,6 @@
'formautofill',
'onboarding',
'pdfjs',

236
disable-reader.patch
View File

@ -8,7 +8,7 @@
<command id="cmd_find"
oncommand="gFindBar.onFindCommand();"
observes="isImage"/>
@@ -284,7 +283,6 @@
@@ -281,7 +280,6 @@
<key id="key_fullScreen_old" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>
<key keycode="VK_F11" command="View:FullScreen"/>
#endif
@ -18,24 +18,16 @@
<key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
--- 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,
@@ -74,8 +74,7 @@ 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 = {
@@ -46,8 +46,6 @@
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",
@@ -4753,7 +4751,6 @@
}
}
UpdateBackForwardCommands(gBrowser.webNavigation);
@ -43,14 +35,36 @@
if (!gMultiProcessBrowser) // Bug 1108553 - Cannot rotate images with e10s
gGestureSupport.restoreRotationState();
@@ -5122,8 +5119,8 @@
aRequest.originalURI &&
(aRequest.originalURI.schemeIs("chrome") ||
(aRequest.originalURI.schemeIs("about") &&
- aWebProgress.isTopLevel &&
- !aRequest.originalURI.spec.startsWith("about:reader")))) {
+ aWebProgress.isTopLevel
+ ))) {
return false;
}
@@ -5195,9 +5192,6 @@
// Filter out location changes caused by anchor navigation
// or history.push/pop/replaceState.
if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
- // Reader mode actually cares about these:
- let mm = gBrowser.selectedBrowser.messageManager;
- mm.sendAsyncMessage("Reader:PushState", {isArticle: gBrowser.selectedBrowser.isArticle});
return;
}
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -888,10 +888,6 @@
@@ -876,11 +876,6 @@
hidden="true"
tooltiptext="&pageReportIcon.tooltip;"
onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
- <image id="reader-mode-button"
- class="urlbar-icon"
- class="urlbar-icon urlbar-page-action"
- role="button"
- hidden="true"
- onclick="ReaderParent.buttonClick(event);"/>
<toolbarbutton id="urlbar-zoom-button"
@ -58,44 +72,36 @@
tooltip="dynamic-shortcut-tooltip"
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -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"],
- ["ReaderParent", "resource:///modules/ReaderParent.jsm"],
["RecentWindow", "resource:///modules/RecentWindow.jsm"],
["RemotePrompt", "resource:///modules/RemotePrompt.jsm"],
["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
@@ -167,9 +165,6 @@ const listeners = {
@@ -55,7 +55,6 @@
PluralForm: "resource://gre/modules/PluralForm.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
- ReaderParent: "resource:///modules/ReaderParent.jsm",
RecentWindow: "resource:///modules/RecentWindow.jsm",
RemotePrompt: "resource:///modules/RemotePrompt.jsm",
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
@@ -145,9 +144,6 @@
"FormValidation:ShowPopup": ["FormValidationHandler"],
"FormValidation:HidePopup": ["FormValidationHandler"],
"Prompt:Open": ["RemotePrompt"],
- "Reader:ArticleGet": ["ReaderParent"],
- "Reader:FaviconRequest": ["ReaderParent"],
- "Reader:UpdateReaderButton": ["ReaderParent"],
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN LoginManagerParent.init
// PLEASE KEEP THIS LIST IN SYNC WITH THE MOBILE LISTENERS IN BrowserCLH.js
"RemoteLogins:findLogins": ["LoginManagerParent"],
"RemoteLogins:findRecipes": ["LoginManagerParent"],
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -30,8 +30,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
@@ -30,8 +30,6 @@
"resource://gre/modules/PrivateBrowsingUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "ProfileAge",
"resource://gre/modules/ProfileAge.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent",
- "resource:///modules/ReaderParent.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PageActions",
"resource:///modules/PageActions.jsm");
XPCOMUtils.defineLazyPreferenceGetter(this, "gPhotonStructure", "browser.photon.structure.enabled");
@@ -40,7 +38,6 @@ const PREF_LOG_LEVEL = "browser.uitour.loglevel";
@@ -40,7 +38,6 @@
const PREF_SEENPAGEIDS = "browser.uitour.seenPageIDs";
const BACKGROUND_PAGE_ACTIONS_ALLOWED = new Set([
@ -103,15 +109,15 @@
"getConfiguration",
"getTreatmentTag",
"hideHighlight",
@@ -205,7 +202,6 @@ this.UITour = {
return aDocument.getElementById(buttonId);
}
@@ -164,7 +161,6 @@
}],
["privateWindow", {query: "#appMenu-private-window-button"}],
["quit", {query: "#appMenu-quit-button"}],
- ["readerMode-urlBar", {query: "#reader-mode-button"}],
["search", {
infoPanelOffsetX: 18,
infoPanelPosition: "after_start",
@@ -664,15 +660,10 @@ this.UITour = {
@@ -653,15 +649,10 @@
}
case "forceShowReaderIcon": {
@ -126,10 +132,140 @@
- });
break;
}
--- a/browser/components/uitour/UITour-lib.js
+++ b/browser/components/uitour/UITour-lib.js
@@ -119,7 +119,6 @@
* <li>pocket
* <li>privateWindow
* <li>quit
- * <li>readerMode-urlBar
* <li>screenshots
* <li>search
* <li>searchIcon
@@ -704,26 +703,6 @@
};
/**
- * @summary Force the reader mode icon to appear in the address bar regardless of whether
- * heuristics determine it's appropriate.
- *
- * @description This is useful if you want to target an annotation (panel/highlight) on it
- * but the tour page doesn't have much textual content.
- */
- Mozilla.UITour.forceShowReaderIcon = function() {
- _sendEvent("forceShowReaderIcon");
- };
-
- /**
- * Toggle into reader mode for the current tab. Once the user enters reader
- * mode, the UITour document will not be active and therefore cannot call other
- * UITour APIs.
- */
- Mozilla.UITour.toggleReaderMode = function() {
- _sendEvent("toggleReaderMode");
- };
-
- /**
* @param {String} pane - Pane to open/switch the preferences to.
* Valid values match fragments on about:preferences and are subject to change e.g.:
*
--- a/browser/components/uitour/test/browser_UITour_toggleReaderMode.js
+++ b/browser/components/uitour/test/browser_UITour_toggleReaderMode.js
@@ -1,16 +0,0 @@
-"use strict";
-
-var gTestTab;
-var gContentAPI;
-var gContentWindow;
-
-add_task(setup_UITourTest);
-
-add_UITour_task(async function() {
- ok(!gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"),
- "Should not be in reader mode at start of test.");
- await gContentAPI.toggleReaderMode();
- await waitForConditionPromise(() => gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"));
- ok(gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"),
- "Should be in reader mode now.");
-});
--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -34,7 +34,6 @@
[browser_UITour_annotation_size_attributes.js]
[browser_UITour_defaultBrowser.js]
[browser_UITour_detach_tab.js]
-[browser_UITour_forceReaderMode.js]
[browser_UITour_modalDialog.js]
skip-if = os != "mac" # modal dialog disabling only working on OS X.
[browser_UITour_observe.js]
@@ -46,4 +45,3 @@
[browser_UITour_resetProfile.js]
[browser_UITour_showNewTab.js]
[browser_UITour_sync.js]
-[browser_UITour_toggleReaderMode.js]
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -31,7 +31,6 @@
browser_scrollPositions_sample.html
browser_scrollPositions_sample2.html
browser_scrollPositions_sample_frameset.html
- browser_scrollPositions_readerModeArticle.html
browser_sessionStorage.html
browser_speculative_connect.html
browser_248970_b_sample.html
@@ -111,7 +110,6 @@
[browser_restore_redirect.js]
[browser_restore_cookies_noOriginAttributes.js]
[browser_scrollPositions.js]
-[browser_scrollPositionsReaderMode.js]
[browser_sessionHistory.js]
support-files =
file_sessionHistory_hashchange.html
--- a/browser/base/content/urlbarBindings.xml 2017-11-02
+++ b/browser/base/content/urlbarBindings.xml 2017-11-24
@@ -230,11 +230,6 @@
break;
}
}
- } else {
- let originalUrl = ReaderMode.getOriginalUrlObjectForDisplay(aValue);
- if (originalUrl) {
- returnValue = originalUrl.displaySpec;
- }
}
// Set the actiontype only if the user is not overriding actions.
@@ -947,26 +942,6 @@
]]></body>
</method>
- <method name="makeURIReadable">
- <parameter name="aURI"/>
- <body>
- <![CDATA[
- // Avoid copying 'about:reader?url=', and always provide the original URI:
- // Reader mode ensures we call createExposableURI itself.
- let readerStrippedURI = ReaderMode.getOriginalUrlObjectForDisplay(aURI.displaySpec);
- if (readerStrippedURI) {
- aURI = readerStrippedURI;
- } else {
- // Only copy exposable URIs
- try {
- aURI = Services.uriFixup.createExposableURI(aURI);
- } catch (ex) {}
- }
- return aURI;
- ]]>
- </body>
- </method>
-
<method name="_getSelectedValueForClipboard">
<body><![CDATA[
// Grab the actual input field's value, not our value, which could include moz-action:
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -85,9 +85,6 @@ with Files("PluginContent.jsm"):
@@ -85,9 +85,6 @@
with Files("ProcessHangMonitor.jsm"):
BUG_COMPONENT = ("Core", "DOM: Content Processes")
@ -139,8 +275,8 @@
with Files("Sanitizer.jsm"):
BUG_COMPONENT = ("Firefox", "Preferences")
@@ -153,7 +150,6 @@ EXTRA_JS_MODULES += [
'PermissionUI.jsm',
@@ -149,7 +146,6 @@
'PingCentre.jsm',
'PluginContent.jsm',
'ProcessHangMonitor.jsm',
- 'ReaderParent.jsm',

585
disable-send-to-device.patch Normal file
View File

@ -0,0 +1,585 @@
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -102,13 +102,6 @@
hidden="true"
oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
#endif
- <menuseparator id="context_sendTabToDevice_separator"/>
- <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
- accesskey="&sendTabToDevice.accesskey;">
- <menupopup id="context_sendTabToDevicePopupMenu"
- onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/>
- </menu>
- <menuseparator/>
<menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
tbattr="tabbrowser-multiple-visible"
oncommand="gBrowser.reloadAllTabs();"/>
@@ -409,46 +402,6 @@
</hbox>
</panel>
- <panel id="pageActionPanel"
- class="cui-widget-panel"
- role="group"
- type="arrow"
- hidden="true"
- flip="slide"
- photon="true"
- position="bottomcenter topright"
- tabspecific="true"
- noautofocus="true"
- copyURL-title="&pageAction.copyLink.label;"
- emailLink-title="&emailPageCmd.label;"
- sendToDevice-title="&pageAction.sendTabToDevice.label;"
- sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
- <photonpanelmultiview id="pageActionPanelMultiView"
- mainViewId="pageActionPanelMainView"
- viewCacheId="appMenu-viewCache">
- <panelview id="pageActionPanelMainView"
- context="pageActionPanelContextMenu"
- oncontextmenu="BrowserPageActions.onContextMenu(event);"
- class="PanelUI-subView">
- <vbox class="panel-subview-body"/>
- </panelview>
- </photonpanelmultiview>
- </panel>
- <panel id="pageActionFeedback"
- role="alert"
- type="arrow"
- hidden="true"
- flip="slide"
- position="bottomcenter topright"
- tabspecific="true"
- noautofocus="true"
- copyURLFeedback="&copyURLFeedback.label;"
- sendToDeviceFeedback="&sendToDeviceFeedback.label;">
- <hbox id="pageActionFeedbackAnimatableBox">
- <image id="pageActionFeedbackAnimatableImage"/>
- </hbox>
- <label id="pageActionFeedbackMessage"/>
- </panel>
<menupopup id="pageActionPanelContextMenu"
onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -258,14 +258,6 @@
label="&savePageCmd.label;"
accesskey="&savePageCmd.accesskey2;"
oncommand="gContextMenu.savePageAs();"/>
- <menuseparator id="context-sep-sendpagetodevice" hidden="true"/>
- <menu id="context-sendpagetodevice"
- label="&sendPageToDevice.label;"
- accesskey="&sendPageToDevice.accesskey;"
- hidden="true">
- <menupopup id="context-sendpagetodevice-popup"
- onpopupshowing="(() => { let browser = gBrowser || getPanelBrowser(); gSync.populateSendTabToDevicesMenu(event.target, browser.currentURI.spec, browser.contentTitle); })()"/>
- </menu>
<menuseparator id="context-sep-viewbgimage"/>
<menuitem id="context-viewbgimage"
label="&viewBGImageCmd.label;"
--- a/browser/base/content/test/sync/browser_contextmenu_sendtab.js
+++ b/browser/base/content/test/sync/browser_contextmenu_sendtab.js
@@ -1,86 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const chrome_base = "chrome://mochitests/content/browser/browser/base/content/test/general/";
-Services.scriptloader.loadSubScript(chrome_base + "head.js", this);
-/* import-globals-from ../general/head.js */
-
-const remoteClientsFixture = [ { id: 1, name: "Foo"}, { id: 2, name: "Bar"} ];
-
-let [testTab] = gBrowser.visibleTabs;
-
-add_task(async function setup() {
- await promiseSyncReady();
- is(gBrowser.visibleTabs.length, 1, "there is one visible tab");
-});
-
-// We are not testing the devices popup contents, since it is already tested by
-// browser_contextmenu_sendpage.js and the code to populate it is the same.
-
-add_task(async function test_tab_contextmenu() {
- const sandbox = setupSendTabMocks({ syncReady: true, clientsSynced: true, remoteClients: remoteClientsFixture,
- state: UIState.STATUS_SIGNED_IN, isSendableURI: true });
-
- await updateTabContextMenu(testTab);
- is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
- is(document.getElementById("context_sendTabToDevice").disabled, false, "Send tab to device is enabled");
-
- sandbox.restore();
-});
-
-add_task(async function test_tab_contextmenu_unconfigured() {
- const sandbox = setupSendTabMocks({ syncReady: true, clientsSynced: true, remoteClients: remoteClientsFixture,
- state: UIState.STATUS_NOT_CONFIGURED, isSendableURI: true });
-
- await updateTabContextMenu(testTab);
- is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
- is(document.getElementById("context_sendTabToDevice").disabled, false, "Send tab to device is enabled");
-
- sandbox.restore();
-});
-
-add_task(async function test_tab_contextmenu_not_sendable() {
- const sandbox = setupSendTabMocks({ syncReady: true, clientsSynced: true, remoteClients: [{ id: 1, name: "Foo"}],
- state: UIState.STATUS_SIGNED_IN, isSendableURI: false });
-
- await updateTabContextMenu(testTab);
- is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
- is(document.getElementById("context_sendTabToDevice").disabled, true, "Send tab to device is disabled");
-
- sandbox.restore();
-});
-
-add_task(async function test_tab_contextmenu_not_synced_yet() {
- const sandbox = setupSendTabMocks({ syncReady: true, clientsSynced: false, remoteClients: [],
- state: UIState.STATUS_SIGNED_IN, isSendableURI: true });
-
- await updateTabContextMenu(testTab);
- is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
- is(document.getElementById("context_sendTabToDevice").disabled, true, "Send tab to device is disabled");
-
- sandbox.restore();
-});
-
-add_task(async function test_tab_contextmenu_sync_not_ready_configured() {
- const sandbox = setupSendTabMocks({ syncReady: false, clientsSynced: false, remoteClients: null,
- state: UIState.STATUS_SIGNED_IN, isSendableURI: true });
-
- await updateTabContextMenu(testTab);
- is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
- is(document.getElementById("context_sendTabToDevice").disabled, true, "Send tab to device is disabled");
-
- sandbox.restore();
-});
-
-add_task(async function test_tab_contextmenu_sync_not_ready_other_state() {
- const sandbox = setupSendTabMocks({ syncReady: false, clientsSynced: false, remoteClients: null,
- state: UIState.STATUS_NOT_VERIFIED, isSendableURI: true });
-
- await updateTabContextMenu(testTab);
- is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
- is(document.getElementById("context_sendTabToDevice").disabled, false, "Send tab to device is enabled");
-
- sandbox.restore();
-});
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -283,205 +283,6 @@
});
},
- openSendToDevicePromo() {
- let url = Services.prefs.getCharPref("app.productInfo.baseURL");
- url += "send-tabs/?utm_source=" + Services.appinfo.name.toLowerCase();
- switchToTabHavingURI(url, true, { replaceQueryString: true });
- },
-
- sendTabToDevice(url, clientId, title) {
- Weave.Service.clientsEngine.sendURIToClientForDisplay(url, clientId, title).catch(e => {
- console.error("Could not send tab to device", e);
- });
- },
-
- populateSendTabToDevicesMenu(devicesPopup, url, title, createDeviceNodeFn) {
- if (!createDeviceNodeFn) {
- createDeviceNodeFn = (clientId, name, clientType) => {
- let eltName = name ? "menuitem" : "menuseparator";
- return document.createElement(eltName);
- };
- }
-
- // remove existing menu items
- for (let i = devicesPopup.childNodes.length - 1; i >= 0; --i) {
- let child = devicesPopup.childNodes[i];
- if (child.classList.contains("sync-menuitem")) {
- child.remove();
- }
- }
-
- if (gSync.syncConfiguredAndLoading) {
- // We can only be in this case in the page action menu.
- return;
- }
-
- const fragment = document.createDocumentFragment();
-
- const state = UIState.get();
- if (state.status == UIState.STATUS_SIGNED_IN && this.remoteClients.length > 0) {
- this._appendSendTabDeviceList(fragment, createDeviceNodeFn, url, title);
- } else if (state.status == UIState.STATUS_SIGNED_IN) {
- this._appendSendTabSingleDevice(fragment, createDeviceNodeFn);
- } else if (state.status == UIState.STATUS_NOT_VERIFIED ||
- state.status == UIState.STATUS_LOGIN_FAILED) {
- this._appendSendTabVerify(fragment, createDeviceNodeFn);
- } else /* status is STATUS_NOT_CONFIGURED */ {
- this._appendSendTabUnconfigured(fragment, createDeviceNodeFn);
- }
-
- devicesPopup.appendChild(fragment);
- },
-
- _appendSendTabDeviceList(fragment, createDeviceNodeFn, url, title) {
- const onTargetDeviceCommand = (event) => {
- let clients = event.target.getAttribute("clientId") ?
- [event.target.getAttribute("clientId")] :
- this.remoteClients.map(client => client.id);
-
- clients.forEach(clientId => this.sendTabToDevice(url, clientId, title));
- }
-
- function addTargetDevice(clientId, name, clientType) {
- const targetDevice = createDeviceNodeFn(clientId, name, clientType);
- targetDevice.addEventListener("command", onTargetDeviceCommand, true);
- targetDevice.classList.add("sync-menuitem", "sendtab-target");
- targetDevice.setAttribute("clientId", clientId);
- targetDevice.setAttribute("clientType", clientType);
- targetDevice.setAttribute("label", name);
- fragment.appendChild(targetDevice);
- }
-
- const clients = this.remoteClients;
- for (let client of clients) {
- const type = client.formfactor && client.formfactor.includes("tablet") ?
- "tablet" : client.type;
- addTargetDevice(client.id, client.name, type);
- }
-
- // "Send to All Devices" menu item
- if (clients.length > 1) {
- const separator = createDeviceNodeFn();
- separator.classList.add("sync-menuitem");
- fragment.appendChild(separator);
- const allDevicesLabel = this.fxaStrings.GetStringFromName("sendToAllDevices.menuitem");
- addTargetDevice("", allDevicesLabel, "");
- }
- },
-
- _appendSendTabSingleDevice(fragment, createDeviceNodeFn) {
- const noDevices = this.fxaStrings.GetStringFromName("sendTabToDevice.singledevice.status");
- const learnMore = this.fxaStrings.GetStringFromName("sendTabToDevice.singledevice");
- this._appendSendTabInfoItems(fragment, createDeviceNodeFn, noDevices, learnMore, () => {
- this.openSendToDevicePromo();
- });
- },
-
- _appendSendTabVerify(fragment, createDeviceNodeFn) {
- const notVerified = this.fxaStrings.GetStringFromName("sendTabToDevice.verify.status");
- const verifyAccount = this.fxaStrings.GetStringFromName("sendTabToDevice.verify");
- this._appendSendTabInfoItems(fragment, createDeviceNodeFn, notVerified, verifyAccount, () => {
- this.openPrefs("sendtab");
- });
- },
-
- _appendSendTabUnconfigured(fragment, createDeviceNodeFn) {
- const notConnected = this.fxaStrings.GetStringFromName("sendTabToDevice.unconfigured.status");
- const learnMore = this.fxaStrings.GetStringFromName("sendTabToDevice.unconfigured");
- this._appendSendTabInfoItems(fragment, createDeviceNodeFn, notConnected, learnMore, () => {
- this.openSendToDevicePromo();
- });
-
- // Now add a 'sign in to sync' item above the 'learn more' item.
- const signInToSync = this.fxaStrings.GetStringFromName("sendTabToDevice.signintosync");
- let signInItem = createDeviceNodeFn(null, signInToSync, null);
- signInItem.classList.add("sync-menuitem");
- signInItem.setAttribute("label", signInToSync);
- // Show an icon if opened in the page action panel:
- if (signInItem.classList.contains("subviewbutton")) {
- signInItem.classList.add("subviewbutton-iconic", "signintosync");
- }
- signInItem.addEventListener("command", () => {
- this.openPrefs("sendtab");
- });
- fragment.insertBefore(signInItem, fragment.lastChild);
- },
-
- _appendSendTabInfoItems(fragment, createDeviceNodeFn, statusLabel, actionLabel, actionCommand) {
- const status = createDeviceNodeFn(null, statusLabel, null);
- status.setAttribute("label", statusLabel);
- status.setAttribute("disabled", true);
- status.classList.add("sync-menuitem");
- fragment.appendChild(status);
-
- const separator = createDeviceNodeFn(null, null, null);
- separator.classList.add("sync-menuitem");
- fragment.appendChild(separator);
-
- const actionItem = createDeviceNodeFn(null, actionLabel, null);
- actionItem.addEventListener("command", actionCommand, true);
- actionItem.classList.add("sync-menuitem");
- actionItem.setAttribute("label", actionLabel);
- fragment.appendChild(actionItem);
- },
-
- isSendableURI(aURISpec) {
- if (!aURISpec) {
- return false;
- }
- // Disallow sending tabs with more than 65535 characters.
- if (aURISpec.length > 65535) {
- return false;
- }
- try {
- // Filter out un-sendable URIs -- things like local files, object urls, etc.
- const unsendableRegexp = new RegExp(
- Services.prefs.getCharPref("services.sync.engine.tabs.filteredUrls"), "i");
- return !unsendableRegexp.test(aURISpec);
- } catch (e) {
- // The preference has been removed, or is an invalid regexp, so we log an
- // error and treat it as a valid URI -- and the more problematic case is
- // the length, which we've already addressed.
- Cu.reportError(`Failed to build url filter regexp for send tab: ${e}`);
- return true;
- }
- },
-
- // "Send Tab to Device" menu item
- updateTabContextMenu(aPopupMenu, aTargetTab) {
- const enabled = !this.syncConfiguredAndLoading &&
- this.isSendableURI(aTargetTab.linkedBrowser.currentURI.spec);
-
- document.getElementById("context_sendTabToDevice").disabled = !enabled;
- },
-
- // "Send Page to Device" and "Send Link to Device" menu items
- updateContentContextMenu(contextMenu) {
- // showSendLink and showSendPage are mutually exclusive
- const showSendLink = contextMenu.onSaveableLink || contextMenu.onPlainTextLink;
- const showSendPage = !showSendLink
- && !(contextMenu.isContentSelected ||
- contextMenu.onImage || contextMenu.onCanvas ||
- contextMenu.onVideo || contextMenu.onAudio ||
- contextMenu.onLink || contextMenu.onTextInput);
-
- ["context-sendpagetodevice", "context-sep-sendpagetodevice"]
- .forEach(id => contextMenu.showItem(id, showSendPage));
- ["context-sendlinktodevice", "context-sep-sendlinktodevice"]
- .forEach(id => contextMenu.showItem(id, showSendLink));
-
- if (!showSendLink && !showSendPage) {
- return;
- }
-
- const targetURI = showSendLink ? contextMenu.linkURL :
- contextMenu.browser.currentURI.spec;
- const enabled = !this.syncConfiguredAndLoading && this.isSendableURI(targetURI);
- contextMenu.setItemAttr(showSendPage ? "context-sendpagetodevice" :
- "context-sendlinktodevice",
- "disabled", !enabled || null);
- },
-
// Functions called by observers
onActivityStart() {
clearTimeout(this._syncAnimationTimer);
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -973,8 +973,6 @@
SessionStoreInternal._resetLocalTabRestoringState(tab);
SessionStoreInternal.restoreNextTab();
- this._sendTabRestoredNotification(tab, data.isRemotenessUpdate);
-
Services.obs.notifyObservers(null, "sessionstore-one-or-no-tab-restored");
break;
case "SessionStore:crashedTabRevived":
@@ -4608,22 +4606,6 @@
},
/**
- * Dispatch the SSTabRestored event for the given tab.
- * @param aTab
- * The tab which has been restored
- * @param aIsRemotenessUpdate
- * True if this tab was restored due to flip from running from
- * out-of-main-process to in-main-process or vice-versa.
- */
- _sendTabRestoredNotification(aTab, aIsRemotenessUpdate) {
- let event = aTab.ownerDocument.createEvent("CustomEvent");
- event.initCustomEvent("SSTabRestored", true, false, {
- isRemotenessUpdate: aIsRemotenessUpdate,
- });
- aTab.dispatchEvent(event);
- },
-
- /**
* @param aWindow
* Window reference
* @returns whether this window's data is still cached in _statesToRestore
--- a/browser/locales/en-US/chrome/browser/accounts.properties
+++ b/browser/locales/en-US/chrome/browser/accounts.properties
@@ -35,33 +35,6 @@
deviceDisconnectedNotification.title = Sync Disconnected
deviceDisconnectedNotification.body = This computer has been successfully disconnected from Firefox Sync.
-# LOCALIZATION NOTE (sendToAllDevices.menuitem)
-# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
-sendToAllDevices.menuitem = Send to All Devices
-
-# LOCALIZATION NOTE (sendTabToDevice.unconfigured, sendTabToDevice.unconfigured.status)
-# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
-# and the Sync account is unconfigured. Redirects to a marketing page.
-sendTabToDevice.unconfigured.status = Not Connected to Sync
-sendTabToDevice.unconfigured = Learn About Sending Tabs…
-
-# LOCALIZATION NOTE (sendTabToDevice.signintosync)
-# Displayed in the Send Tabs context menu and the page action panel when sync is not
-# configured. Allows users to immediately sign into sync via the preferences.
-sendTabToDevice.signintosync = Sign in to Sync…
-
-# LOCALIZATION NOTE (sendTabToDevice.singledevice, sendTabToDevice.singledevice.status)
-# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
-# and the Sync account has only 1 device. Redirects to a marketing page.
-sendTabToDevice.singledevice.status = No Devices Connected
-sendTabToDevice.singledevice = Learn About Sending Tabs…
-
-# LOCALIZATION NOTE (sendTabToDevice.verify, sendTabToDevice.verify.status)
-# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
-# and the Sync account is unverified. Redirects to the Sync preferences page.
-sendTabToDevice.verify.status = Account Not Verified
-sendTabToDevice.verify = Verify Your Account…
-
# LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title,
# multipleTabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,
# unnamedTabsArrivingNotificationMultiple2.body, unnamedTabsArrivingNotificationNoDevice.body)
--- a/browser/base/content/test/general/browser_contextmenu.js
+++ b/browser/base/content/test/general/browser_contextmenu.js
@@ -44,8 +44,6 @@
...(hasPocket ? ["context-savelinktopocket", true] : []),
"context-copylink", true,
"context-searchselect", true,
- "---", null,
- "context-sendlinktodevice", true, [], null,
]
);
@@ -97,8 +95,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"---", null,
@@ -125,8 +121,6 @@
...(hasPocket ? ["context-savelinktopocket", true] : []),
"context-copylink", true,
"context-searchselect", true,
- "---", null,
- "context-sendlinktodevice", true, [], null,
]
);
});
@@ -268,8 +262,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"frame", null,
@@ -572,8 +564,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"---", null,
@@ -606,8 +596,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"---", null,
@@ -655,8 +643,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"---", null,
@@ -704,7 +690,6 @@
"---", null,
"context-searchselect", true,
"---", null,
- "context-sendlinktodevice", true, [], null,
"context-viewpartialsource-selection", true
],
{
@@ -746,8 +731,6 @@
"context-sendimage", true,
"context-setDesktopBackground", true,
"context-viewimageinfo", true,
- "---", null,
- "context-sendlinktodevice", true, [], null,
]
);
});
@@ -840,8 +823,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"---", null,
@@ -887,8 +868,6 @@
"context-savepage", true,
...(hasPocket ? ["context-pocket", true] : []),
"---", null,
- "context-sendpagetodevice", true, [], null,
- "---", null,
"context-viewbgimage", false,
"context-selectall", true,
"frame", null,
@@ -940,8 +919,6 @@
...(hasPocket ? ["context-savelinktopocket", true] : []),
"context-copylink", true,
"context-searchselect", true,
- "---", null,
- "context-sendlinktodevice", true, [], null,
]
);
@@ -959,8 +936,6 @@
...(hasPocket ? ["context-savelinktopocket", true] : []),
"context-copylink", true,
"context-searchselect", true,
- "---", null,
- "context-sendlinktodevice", true, [], null,
]
);
@@ -978,8 +953,6 @@
...(hasPocket ? ["context-savelinktopocket", true] : []),
"context-copylink", true,
"context-searchselect", true,
- "---", null,
- "context-sendlinktodevice", true, [], null,
]
);
});
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -738,7 +738,6 @@
},
initSyncItems() {
- gSync.updateContentContextMenu(this);
},
openPasswordManager() {

30
disable-system-addons.patch Normal file
View File

@ -0,0 +1,30 @@
--- a/browser/moz.build 2017-11-02
+++ b/browser/moz.build 2017-11-21
@@ -11,12 +11,10 @@
DIRS += [
'base',
'components',
- 'experiments',
'fonts',
'locales',
'modules',
'themes',
- 'extensions',
]
DIRS += [
@@ -27,7 +25,6 @@
DIRS += ['installer/windows']
TEST_DIRS += [
- 'tools/mozscreenshots',
]
DIST_SUBDIR = 'browser'
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -107,4 +107,3 @@
.PHONY: features
tools features::
- $(PYTHON) -c 'import os, json; listing = {"system": os.listdir("$(DIST)/bin/browser/features")}; print json.dumps(listing)' > $(DIST)/bin/browser/chrome/browser/content/browser/built_in_addons.json

2
disable-telemetry.patch
View File

@ -1,6 +1,6 @@
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -62,7 +62,11 @@ fi
@@ -63,7 +63,11 @@
MOZ_PROFILE_MIGRATOR=1
# Enable checking that add-ons are signed by the trusted root

348
preferences.patch
View File

@ -1,7 +1,7 @@
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -255,7 +255,7 @@ pref("browser.touchmode.auto", false);
#endif
@@ -244,7 +244,7 @@
pref("browser.touchmode.auto", true);
// 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);
@@ -265,7 +265,7 @@ pref("browser.defaultbrowser.notificationbar", false);
@@ -254,7 +254,7 @@
// 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);
@@ -327,7 +327,7 @@ pref("browser.urlbar.suggest.history",
@@ -318,7 +318,7 @@
pref("browser.urlbar.suggest.bookmark", true);
pref("browser.urlbar.suggest.openpage", true);
pref("browser.urlbar.suggest.searches", true);
@ -27,16 +27,25 @@
// The suggestion opt-in notification will be shown on 4 different days.
pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4);
pref("browser.urlbar.lastSuggestionsPromptDate", 20160601);
@@ -372,7 +372,7 @@ pref("browser.download.manager.resumeOnW
@@ -363,7 +363,7 @@
pref("browser.download.animateNotifications", true);
// This records whether or not the panel has been shown at least once.
-pref("browser.download.panel.shown", false);
+pref("browser.download.panel.shown", true);
#ifndef XP_MACOSX
pref("browser.helperApps.deleteTempFileOnExit", true);
@@ -459,7 +459,7 @@ pref("browser.photon.structure.enabled",
// This controls whether the button is automatically shown/hidden depending
// on whether there are downloads to show.
@@ -415,7 +415,7 @@
pref("browser.sessionhistory.max_entries", 50);
// Built-in default permissions.
-pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions");
+pref("permissions.manager.defaultsUrl", "");
// handle links targeting new windows
// 1=current window/tab, 2=new window, 3=new tab in most recent window
@@ -445,7 +445,7 @@
// Tabbed browser
pref("browser.tabs.closeWindowWithLastTab", true);
pref("browser.tabs.insertRelatedAfterCurrent", true);
@ -45,7 +54,7 @@
pref("browser.tabs.warnOnCloseOtherTabs", true);
pref("browser.tabs.warnOnOpen", true);
pref("browser.tabs.maxOpenBeforeWarn", 15);
@@ -643,7 +643,7 @@ pref("browser.xul.error_pages.enabled",
@@ -636,7 +636,7 @@
pref("browser.xul.error_pages.expert_bad_cert", false);
// Enable captive portal detection.
@ -54,7 +63,7 @@
// If true, network link events will change the value of navigator.onLine
pref("network.manage-offline-status", true);
@@ -1262,7 +1262,7 @@ pref("browser.newtab.preload", true);
@@ -1240,7 +1240,7 @@
// 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.
@ -63,6 +72,103 @@
// Toggles the content of 'about:newtab'. Shows the grid when enabled.
pref("browser.newtabpage.enabled", true);
@@ -1264,11 +1264,11 @@
pref("browser.newtabpage.directory.source", "https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%");
// activates Activity Stream
-pref("browser.newtabpage.activity-stream.enabled", true);
-pref("browser.newtabpage.activity-stream.prerender", true);
-pref("browser.newtabpage.activity-stream.aboutHome.enabled", true);
+pref("browser.newtabpage.activity-stream.enabled", false);
+pref("browser.newtabpage.activity-stream.prerender", false);
+pref("browser.newtabpage.activity-stream.aboutHome.enabled", false);
-pref("browser.library.activity-stream.enabled", true);
+pref("browser.library.activity-stream.enabled", false);
// Enable the DOM fullscreen API.
pref("full-screen-api.enabled", true);
@@ -1330,7 +1330,7 @@
// Some of these prefs are specified even though they are redundant; they are
// here for clarity and end-user experiments.
#ifndef EARLY_BETA_OR_EARLIER
-pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%");
+pref("geo.wifi.uri", "");
#ifdef XP_MACOSX
pref("geo.provider.use_corelocation", false);
@@ -1347,20 +1347,20 @@
#else
// Geolocation preferences for Nightly/Aurora/Beta.
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+pref("geo.wifi.uri", "");
#ifdef XP_MACOSX
-pref("geo.provider.use_corelocation", true);
+pref("geo.provider.use_corelocation", false);
#endif
// The native Windows location provider is only enabled in Nightly and likely to
// be unstable. Set to false if things are really broken.
#if defined(XP_WIN) && defined(NIGHTLY_BUILD)
-pref("geo.provider.ms-windows-location", true);
+pref("geo.provider.ms-windows-location", false);
#endif
#if defined(MOZ_WIDGET_GTK) && defined(MOZ_GPSD)
-pref("geo.provider.use_gpsd", true);
+pref("geo.provider.use_gpsd", false);
#endif
#endif
@@ -1481,32 +1481,32 @@
// Telemetry settings.
// Determines if Telemetry pings can be archived locally.
-pref("toolkit.telemetry.archive.enabled", true);
+pref("toolkit.telemetry.archive.enabled", false);
// Enables sending the shutdown ping when Firefox shuts down.
-pref("toolkit.telemetry.shutdownPingSender.enabled", true);
+pref("toolkit.telemetry.shutdownPingSender.enabled", false);
// Enables sending the shutdown ping using the pingsender from the first session.
pref("toolkit.telemetry.shutdownPingSender.enabledFirstSession", false);
// Enables sending a duplicate of the first shutdown ping from the first session.
-pref("toolkit.telemetry.firstShutdownPing.enabled", true);
+pref("toolkit.telemetry.firstShutdownPing.enabled", false);
// Enables sending the 'new-profile' ping on new profiles.
-pref("toolkit.telemetry.newProfilePing.enabled", true);
+pref("toolkit.telemetry.newProfilePing.enabled", false);
// Enables sending 'update' pings on Firefox updates.
-pref("toolkit.telemetry.updatePing.enabled", true);
+pref("toolkit.telemetry.updatePing.enabled", false);
// Enables sending 'bhr' pings when the browser hangs.
-pref("toolkit.telemetry.bhrPing.enabled", true);
+pref("toolkit.telemetry.bhrPing.enabled", false);
// Telemetry experiments settings.
-pref("experiments.enabled", true);
-pref("experiments.manifest.fetchIntervalSeconds", 86400);
-pref("experiments.manifest.uri", "https://telemetry-experiment.cdn.mozilla.net/manifest/v1/firefox/%VERSION%/%CHANNEL%");
+pref("experiments.enabled", false);
+pref("experiments.manifest.fetchIntervalSeconds", 0);
+pref("experiments.manifest.uri", "");
// Whether experiments are supported by the current application profile.
-pref("experiments.supported", true);
+pref("experiments.supported", false);
// Ping Centre Telemetry settings.
-pref("browser.ping-centre.telemetry", true);
+pref("browser.ping-centre.telemetry", false);
pref("browser.ping-centre.log", false);
-pref("browser.ping-centre.staging.endpoint", "https://onyx_tiles.stage.mozaws.net/v3/links/ping-centre");
-pref("browser.ping-centre.production.endpoint", "https://tiles.services.mozilla.com/v3/links/ping-centre");
+pref("browser.ping-centre.staging.endpoint", "");
+pref("browser.ping-centre.production.endpoint", "");
// Enable GMP support in the addon manager.
pref("media.gmp-provider.enabled", true);
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -3,7 +3,7 @@
@ -87,7 +193,7 @@
#if MOZ_CRASHREPORTER
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -31,7 +31,7 @@ pref("general.useragent.site_specific_ov
@@ -31,7 +31,7 @@
pref("general.config.obscure_value", 13); // for MCD .cfg files
@ -96,16 +202,7 @@
// maximum number of dated backups to keep at any time
pref("browser.bookmarks.max_backups", 5);
@@ -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", 6);
#ifdef MOZ_APPLEMEDIA
@@ -474,7 +474,7 @@ pref("media.navigator.video.use_tmmbr", false);
@@ -456,7 +456,7 @@
pref("media.navigator.audio.use_fec", true);
pref("media.navigator.video.red_ulpfec_enabled", false);
@ -114,7 +211,7 @@
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
@@ -466,15 +466,15 @@
pref("media.navigator.video.default_width",0); // adaptive default
pref("media.navigator.video.default_height",0); // adaptive default
@ -133,7 +230,7 @@
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
@@ -497,7 +497,7 @@
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);
@ -142,7 +239,7 @@
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);
@@ -508,7 +508,7 @@
// 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.
@ -151,7 +248,16 @@
#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",
@@ -933,7 +933,7 @@
//
// Values are -1 always on. 1 always off, 0 is auto as some platform perform
// further checks.
-pref("accessibility.force_disabled", 0);
+pref("accessibility.force_disabled", 1);
pref("accessibility.AOM.enabled", false);
@@ -1381,7 +1381,7 @@
// the popup will be called when the popup is dismissed.
pref("privacy.permissionPrompts.showCloseButton", false);
// Enforce tracking protection in all modes
@ -160,7 +266,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
@@ -1700,7 +1700,7 @@ pref("network.http.network-changed.timeo
@@ -1757,7 +1757,7 @@
// The maximum number of current global half open sockets allowable
// when starting a new speculative connection.
@ -169,7 +275,7 @@
// Whether or not to block requests for non head js/css items (e.g. media)
// while those elements load.
@@ -2014,7 +2014,7 @@ pref("network.dns.get-ttl", true);
@@ -2066,7 +2066,7 @@
pref("network.dnsCacheExpirationGracePeriod", 60);
// This preference can be used to turn off DNS prefetch.
@ -178,16 +284,16 @@
// This preference controls whether .onion hostnames are
// rejected before being given to DNS. RFC 7686
@@ -2053,7 +2053,7 @@ pref("network.dir.format", 2);
@@ -2105,7 +2105,7 @@
// enables the prefetch service (i.e., prefetching of <link rel="next"> and
// <link rel="prefetch"> URLs).
-pref("network.prefetch-next", true);
+pref("network.prefetch-next", false);
// enables the preloading (i.e., preloading of <link rel="preload"> URLs).
pref("network.preload", true);
@@ -2558,7 +2558,7 @@ pref("security.allow_chrome_frames_insid
pref("network.preload", false);
@@ -2616,7 +2616,7 @@
pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
// Blocklist preferences
@ -196,25 +302,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);
@@ -4162,7 +4162,7 @@ pref("browser.drag_out_of_frame_style",
// Middle-mouse handling
pref("middlemouse.paste", true);
-pref("middlemouse.contentLoadURL", true);
+pref("middlemouse.contentLoadURL", false);
pref("middlemouse.openNewWindow", true);
pref("middlemouse.scrollbarPosition", true);
@@ -4225,7 +4225,7 @@ pref("browser.drag_out_of_frame_style",
// Middle-mouse handling
pref("middlemouse.paste", true);
-pref("middlemouse.contentLoadURL", true);
+pref("middlemouse.contentLoadURL", false);
pref("middlemouse.openNewWindow", true);
pref("middlemouse.scrollbarPosition", true);
@@ -4583,7 +4583,7 @@ pref("signon.masterPasswordReprompt.time
@@ -4614,7 +4614,7 @@
// Satchel (Form Manager) prefs
pref("browser.formfill.debug", false);
@ -223,16 +311,16 @@
pref("browser.formfill.expire_days", 180);
pref("browser.formfill.agedWeight", 2);
pref("browser.formfill.bucketSize", 1);
@@ -4695,7 +4695,7 @@ pref("gl.ignore-dx-interop2-blacklist", false);
pref("gl.use-tls-is-current", 0);
@@ -4738,7 +4738,7 @@
pref("webgl.1.allow-core-profiles", false);
#endif
pref("webgl.force-enabled", false);
-pref("webgl.disabled", false);
+pref("webgl.disabled", true);
pref("webgl.disable-angle", false);
pref("webgl.disable-wgl", false);
pref("webgl.min_capability_mode", false);
@@ -4909,13 +4909,13 @@ pref("layers.force-active", false);
@@ -4952,13 +4952,13 @@
pref("layers.gralloc.disable", false);
// Enable/Disable the geolocation API for content
@ -248,16 +336,16 @@
// Enable/Disable the device storage API for content
pref("device.storage.enabled", false);
@@ -5029,7 +5029,7 @@ pref("dom.vibrator.max_vibrate_ms", 1000
@@ -5072,7 +5072,7 @@
pref("dom.vibrator.max_vibrate_list_len", 128);
// Battery API
-pref("dom.battery.enabled", true);
+pref("dom.battery.enabled", false);
// Push
@@ -5181,8 +5181,8 @@ pref("social.directories", "https://acti
// Streams API
pref("dom.streams.enabled", false);
@@ -5231,8 +5231,8 @@
// 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.
@ -268,143 +356,7 @@
// Disable idle observer fuzz, because only privileged content can access idle
// observers (bug 780507).
@@ -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.
-pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple");
-#else
-pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple");
-#endif
+pref("urlclassifier.phishTable", "");
// Tables for application reputation.
-pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256");
-pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar");
+pref("urlclassifier.downloadAllowTable", "");
+pref("urlclassifier.downloadBlockTable", "");
-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.
@@ -5356,58 +5350,54 @@ pref("urlclassifier.update.timeout_ms", 90000);
pref("urlclassifier.alternate_error_page", "blocked");
// Enable phishing protection
-pref("browser.safebrowsing.phishing.enabled", true);
+pref("browser.safebrowsing.phishing.enabled", false);
// Enable malware protection
-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.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%");
-pref("browser.safebrowsing.downloads.remote.block_dangerous", true);
-pref("browser.safebrowsing.downloads.remote.block_dangerous_host", true);
-pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", true);
-pref("browser.safebrowsing.downloads.remote.block_uncommon", true);
+pref("browser.safebrowsing.downloads.remote.block_dangerous", false);
+pref("browser.safebrowsing.downloads.remote.block_dangerous_host", false);
+pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false);
+pref("browser.safebrowsing.downloads.remote.block_uncommon", false);
pref("browser.safebrowsing.debug", false);
// The protocol version we communicate with google server.
pref("browser.safebrowsing.provider.google.pver", "2.2");
-pref("browser.safebrowsing.provider.google.lists", "goog-badbinurl-shavar,goog-downloadwhite-digest256,goog-phish-shavar,googpub-phish-shavar,goog-malware-shavar,goog-unwanted-shavar");
-pref("browser.safebrowsing.provider.google.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
-pref("browser.safebrowsing.provider.google.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
-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.gethashURL", "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST");
-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", "");
// The table and global pref for blocking plugin content
-pref("browser.safebrowsing.blockedURIs.enabled", true);
-pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256");
+pref("browser.safebrowsing.blockedURIs.enabled", false);
+pref("urlclassifier.blockedTable", "");
// The protocol version we communicate with mozilla server.
pref("browser.safebrowsing.provider.mozilla.pver", "2.2");
-pref("browser.safebrowsing.provider.mozilla.lists", "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("browser.safebrowsing.provider.mozilla.updateURL", "https://shavar.services.mozilla.com/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
-pref("browser.safebrowsing.provider.mozilla.gethashURL", "https://shavar.services.mozilla.com/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
+pref("browser.safebrowsing.provider.mozilla.lists", "");
+pref("browser.safebrowsing.provider.mozilla.updateURL", "");
+pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
// 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
@@ -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);
@@ -5559,10 +5559,10 @@
// The URL of the Firefox Accounts auth server backend
pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
@ -417,7 +369,7 @@
// SW Cache API
@@ -5546,7 +5546,7 @@ pref("browser.search.suggest.enabled", t
@@ -5606,7 +5606,7 @@
pref("browser.search.reset.enabled", false);
pref("browser.search.reset.whitelist", "");
pref("browser.search.geoSpecificDefaults", false);
@ -426,7 +378,7 @@
pref("browser.search.geoip.timeout", 3000);
#ifdef MOZ_OFFICIAL_BRANDING
@@ -5560,7 +5560,7 @@ pref("browser.search.official", true);
@@ -5620,7 +5620,7 @@
//pref("media.gmp-manager.url.override", "");
// Update service URL for GMP install/updates:
@ -435,7 +387,7 @@
// When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the
// final certificate and all certificates the connection is redirected to before
@@ -5585,14 +5585,14 @@ pref("media.gmp-manager.cert.requireBuiltIn", true);
@@ -5645,14 +5645,14 @@
// IMPORTANT! app.update.certs.* prefs should also be updated if these
// are updated.
pref("media.gmp-manager.cert.checkAttributes", true);