update for 52.7.3
This commit is contained in:
parent
35078555cd
commit
c006b8c002
GPG Key ID:
91BE884FBA4B591A
@ -27,7 +27,7 @@
|
||||
["RecentWindow", "resource:///modules/RecentWindow.jsm"],
|
||||
["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
|
||||
["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"],
|
||||
@@ -4582,7 +4580,6 @@ var XULBrowserWindow = {
|
||||
@@ -4579,7 +4577,6 @@ var XULBrowserWindow = {
|
||||
}
|
||||
}
|
||||
UpdateBackForwardCommands(gBrowser.webNavigation);
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
gGestureSupport.restoreRotationState();
|
||||
|
||||
@@ -4883,9 +4880,6 @@ var TabsProgressListener = {
|
||||
@@ -4880,9 +4877,6 @@ var TabsProgressListener = {
|
||||
// Filter out location changes caused by anchor navigation
|
||||
// or history.push/pop/replaceState.
|
||||
if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
--- a/browser/base/content/browser.xul
|
||||
+++ b/browser/base/content/browser.xul
|
||||
@@ -766,10 +766,6 @@
|
||||
@@ -759,10 +759,6 @@
|
||||
hidden="true"
|
||||
tooltiptext="&pageReportIcon.tooltip;"
|
||||
onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
|
||||
|
||||
@ -30,70 +30,6 @@
|
||||
<menuitem id="context-shareselect"
|
||||
label="&shareSelect.label;"
|
||||
accesskey="&shareSelect.accesskey;"
|
||||
--- a/browser/base/content/browser.xul
|
||||
+++ b/browser/base/content/browser.xul
|
||||
@@ -104,13 +104,6 @@
|
||||
hidden="true"
|
||||
oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
|
||||
#endif
|
||||
- <menuseparator id="context_sendTabToDevice_separator" hidden="true"/>
|
||||
- <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
|
||||
- accesskey="&sendTabToDevice.accesskey;" hidden="true">
|
||||
- <menupopup id="context_sendTabToDevicePopupMenu"
|
||||
- onpopupshowing="gFxAccounts.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();"/>
|
||||
--- a/browser/components/sessionstore/SessionStore.jsm
|
||||
+++ b/browser/components/sessionstore/SessionStore.jsm
|
||||
@@ -894,7 +894,6 @@ var SessionStoreInternal = {
|
||||
SessionStoreInternal._resetLocalTabRestoringState(tab);
|
||||
SessionStoreInternal.restoreNextTab();
|
||||
|
||||
- this._sendTabRestoredNotification(tab, data.isRemotenessUpdate);
|
||||
break;
|
||||
case "SessionStore:crashedTabRevived":
|
||||
// The browser was revived by navigating to a different page
|
||||
@@ -4272,22 +4271,6 @@ var SessionStoreInternal = {
|
||||
aWindow.dispatchEvent(event);
|
||||
},
|
||||
|
||||
- /**
|
||||
- * 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
|
||||
--- a/browser/locales/en-US/chrome/browser/accounts.properties
|
||||
+++ b/browser/locales/en-US/chrome/browser/accounts.properties
|
||||
@@ -35,10 +35,6 @@ syncStartNotification.body2 = %S will begin syncing momentarily.
|
||||
deviceDisconnectedNotification.title = Sync disconnected
|
||||
deviceDisconnectedNotification.body = This computer has been successfully disconnected from Firefox Sync.
|
||||
|
||||
-# LOCALIZATION NOTE (sendTabToAllDevices.menuitem)
|
||||
-# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link.
|
||||
-sendTabToAllDevices.menuitem = All Devices
|
||||
-
|
||||
# LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title,
|
||||
# tabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,
|
||||
# unnamedTabsArrivingNotificationMultiple2.body, unnamedTabsArrivingNotificationNoDevice.body)
|
||||
diff --git a/browser/base/content/browser-fxaccounts.js b/browser/base/content/browser-fxaccounts.js
|
||||
index 0bbce3e..205e28b 100644
|
||||
--- a/browser/base/content/browser-fxaccounts.js
|
||||
+++ b/browser/base/content/browser-fxaccounts.js
|
||||
@@ -371,81 +371,13 @@ var gFxAccounts = {
|
||||
@ -178,4 +114,65 @@ index 0bbce3e..205e28b 100644
|
||||
};
|
||||
|
||||
XPCOMUtils.defineLazyGetter(gFxAccounts, "FxAccountsCommon", function () {
|
||||
--- a/browser/base/content/browser.xul
|
||||
+++ b/browser/base/content/browser.xul
|
||||
@@ -104,13 +104,6 @@
|
||||
hidden="true"
|
||||
oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
|
||||
#endif
|
||||
- <menuseparator id="context_sendTabToDevice_separator" hidden="true"/>
|
||||
- <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
|
||||
- accesskey="&sendTabToDevice.accesskey;" hidden="true">
|
||||
- <menupopup id="context_sendTabToDevicePopupMenu"
|
||||
- onpopupshowing="gFxAccounts.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();"/>
|
||||
--- a/browser/components/sessionstore/SessionStore.jsm
|
||||
+++ b/browser/components/sessionstore/SessionStore.jsm
|
||||
@@ -894,7 +894,6 @@ var SessionStoreInternal = {
|
||||
SessionStoreInternal._resetLocalTabRestoringState(tab);
|
||||
SessionStoreInternal.restoreNextTab();
|
||||
|
||||
- this._sendTabRestoredNotification(tab, data.isRemotenessUpdate);
|
||||
break;
|
||||
case "SessionStore:crashedTabRevived":
|
||||
// The browser was revived by navigating to a different page
|
||||
@@ -4272,22 +4271,6 @@ var SessionStoreInternal = {
|
||||
aWindow.dispatchEvent(event);
|
||||
},
|
||||
|
||||
- /**
|
||||
- * 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
|
||||
--- a/browser/locales/en-US/chrome/browser/accounts.properties
|
||||
+++ b/browser/locales/en-US/chrome/browser/accounts.properties
|
||||
@@ -35,10 +35,6 @@ syncStartNotification.body2 = %S will begin syncing momentarily.
|
||||
deviceDisconnectedNotification.title = Sync disconnected
|
||||
deviceDisconnectedNotification.body = This computer has been successfully disconnected from Firefox Sync.
|
||||
|
||||
-# LOCALIZATION NOTE (sendTabToAllDevices.menuitem)
|
||||
-# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link.
|
||||
-sendTabToAllDevices.menuitem = All Devices
|
||||
-
|
||||
# LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title,
|
||||
# tabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,
|
||||
# unnamedTabsArrivingNotificationMultiple2.body, unnamedTabsArrivingNotificationNoDevice.body)
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
--- a/browser/confvars.sh
|
||||
+++ b/browser/confvars.sh
|
||||
@@ -63,7 +63,8 @@
|
||||
MOZ_PROFILE_MIGRATOR=1
|
||||
|
||||
# Enable checking that add-ons are signed by the trusted root
|
||||
-MOZ_ADDON_SIGNING=1
|
||||
+MOZ_ADDON_SIGNING=0
|
||||
+MOZ_ALLOW_LEGACY_EXTENSIONS=1
|
||||
|
||||
# Include the DevTools client, not just the server (which is the default)
|
||||
MOZ_DEVTOOLS=all
|
||||
--- a/browser/app/profile/firefox.js
|
||||
+++ b/browser/app/profile/firefox.js
|
||||
@@ -89,10 +89,10 @@
|
||||
#endif
|
||||
|
||||
// Extensions that should not be flagged as legacy in about:addons
|
||||
-pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},testpilot@cliqz.com,@testpilot-containers,jid1-NeEaf3sAHdKHPA@jetpack,@activity-streams,pulse@mozilla.com,@testpilot-addon,@min-vid,tabcentertest1@mozilla.com,snoozetabs@mozilla.com,speaktome@mozilla.com,hoverpad@mozilla.com");
|
||||
+pref("extensions.legacy.exceptions", "");
|
||||
|
||||
// Require signed add-ons by default
|
||||
-pref("xpinstall.signatures.required", true);
|
||||
+pref("xpinstall.signatures.required", false);
|
||||
pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
|
||||
|
||||
// Dictionary download preference
|
||||
@@ -1568,7 +1568,7 @@
|
||||
pref("extensions.allow-non-mpc-extensions", false);
|
||||
#endif
|
||||
|
||||
-pref("extensions.legacy.enabled", false);
|
||||
+pref("extensions.legacy.enabled", true);
|
||||
|
||||
// Enable blocking of e10s and e10s-multi for add-on users on beta/release.
|
||||
#if defined(RELEASE_OR_BETA) && !defined(MOZ_DEV_EDITION)
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/modules/libpref/init/all.js
|
||||
+++ b/modules/libpref/init/all.js
|
||||
@@ -1284,12 +1284,7 @@ pref("javascript.options.mem.gc_max_empty_chunk_count", 30);
|
||||
@@ -1269,12 +1269,7 @@ pref("javascript.options.mem.gc_max_empty_chunk_count", 30);
|
||||
|
||||
pref("javascript.options.showInConsole", false);
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
|
||||
#ifndef XP_MACOSX
|
||||
pref("browser.helperApps.deleteTempFileOnExit", true);
|
||||
@@ -389,7 +389,7 @@ pref("browser.search.reset.enabled", true);
|
||||
@@ -388,7 +388,7 @@ pref("browser.search.reset.enabled", true);
|
||||
pref("browser.sessionhistory.max_entries", 50);
|
||||
|
||||
// Built-in default permissions.
|
||||
@ -56,7 +56,7 @@
|
||||
|
||||
// handle links targeting new windows
|
||||
// 1=current window/tab, 2=new window, 3=new tab in most recent window
|
||||
@@ -419,7 +419,7 @@ pref("browser.link.open_newwindow.disabled_in_fullscreen", false);
|
||||
@@ -418,7 +418,7 @@ pref("browser.link.open_newwindow.disabled_in_fullscreen", false);
|
||||
// Tabbed browser
|
||||
pref("browser.tabs.closeWindowWithLastTab", true);
|
||||
pref("browser.tabs.insertRelatedAfterCurrent", true);
|
||||
@ -65,7 +65,7 @@
|
||||
pref("browser.tabs.warnOnCloseOtherTabs", true);
|
||||
pref("browser.tabs.warnOnOpen", true);
|
||||
pref("browser.tabs.maxOpenBeforeWarn", 15);
|
||||
@@ -596,7 +596,7 @@ pref("browser.xul.error_pages.enabled", true);
|
||||
@@ -595,7 +595,7 @@ pref("browser.xul.error_pages.enabled", true);
|
||||
pref("browser.xul.error_pages.expert_bad_cert", false);
|
||||
|
||||
// Enable captive portal detection.
|
||||
@ -74,7 +74,7 @@
|
||||
|
||||
// If true, network link events will change the value of navigator.onLine
|
||||
pref("network.manage-offline-status", true);
|
||||
@@ -774,7 +774,7 @@ pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/fi
|
||||
@@ -773,7 +773,7 @@ pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/fi
|
||||
|
||||
pref("browser.EULA.version", 3);
|
||||
pref("browser.rights.version", 3);
|
||||
@ -83,7 +83,7 @@
|
||||
|
||||
#ifdef DEBUG
|
||||
// Don't show the about:rights notification in debug builds.
|
||||
@@ -1150,18 +1150,18 @@ pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.prop
|
||||
@@ -1149,18 +1149,18 @@ pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.prop
|
||||
pref("prompts.tab_modal.enabled", true);
|
||||
|
||||
// Activates preloading of the new tab url.
|
||||
@ -106,7 +106,7 @@
|
||||
|
||||
// enables Activity Stream inspired layout
|
||||
pref("browser.newtabpage.compact", false);
|
||||
@@ -1176,10 +1176,10 @@ pref("browser.newtabpage.rows", 3);
|
||||
@@ -1175,10 +1175,10 @@ pref("browser.newtabpage.rows", 3);
|
||||
pref("browser.newtabpage.columns", 5);
|
||||
|
||||
// directory tiles download URL
|
||||
@ -119,7 +119,7 @@
|
||||
|
||||
// activates the remote-hosted newtab page
|
||||
pref("browser.newtabpage.remote", false);
|
||||
@@ -1207,10 +1207,10 @@ pref("toolkit.startup.max_resumed_crashes", 3);
|
||||
@@ -1206,10 +1206,10 @@ pref("toolkit.startup.max_resumed_crashes", 3);
|
||||
// Completely disable pdf.js as an option to preview pdfs within firefox.
|
||||
// Note: if this is not disabled it does not necessarily mean pdf.js is the pdf
|
||||
// handler just that it is an option.
|
||||
@ -132,7 +132,7 @@
|
||||
// The values of preferredAction and alwaysAskBeforeHandling before pdf.js
|
||||
// became the default.
|
||||
pref("pdfjs.previousHandler.preferredAction", 0);
|
||||
@@ -1248,38 +1248,11 @@ pref("plain_text.wrap_long_lines", true);
|
||||
@@ -1247,38 +1247,11 @@ pref("plain_text.wrap_long_lines", true);
|
||||
// before content.
|
||||
pref("dom.debug.propagate_gesture_events_through_content", false);
|
||||
|
||||
@ -173,7 +173,7 @@
|
||||
|
||||
// CustomizableUI debug logging.
|
||||
pref("browser.uiCustomization.debug", false);
|
||||
@@ -1323,8 +1296,8 @@ pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sy
|
||||
@@ -1322,8 +1295,8 @@ pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sy
|
||||
|
||||
// URLs for promo links to mobile browsers. Note that consumers are expected to
|
||||
// append a value for utm_campaign.
|
||||
@ -184,7 +184,7 @@
|
||||
|
||||
// Migrate any existing Firefox Account data from the default profile to the
|
||||
// Developer Edition profile.
|
||||
@@ -1340,7 +1313,6 @@ pref("ui.key.menuAccessKeyFocuses", true);
|
||||
@@ -1339,7 +1312,6 @@ pref("ui.key.menuAccessKeyFocuses", true);
|
||||
#endif
|
||||
|
||||
// Encrypted media extensions.
|
||||
@ -192,7 +192,7 @@
|
||||
// On Linux EME is visible but disabled by default. This is so that the
|
||||
// "Play DRM content" checkbox in the Firefox UI is unchecked by default.
|
||||
// DRM requires downloading and installing proprietary binaries, which
|
||||
@@ -1349,10 +1321,7 @@ pref("ui.key.menuAccessKeyFocuses", true);
|
||||
@@ -1348,10 +1320,7 @@ pref("ui.key.menuAccessKeyFocuses", true);
|
||||
// enable DRM, whereupon the EME plugin binaries will be downloaded if
|
||||
// permission is granted.
|
||||
pref("media.eme.enabled", false);
|
||||
@ -204,7 +204,7 @@
|
||||
|
||||
// Decode using Gecko Media Plugins in <video>, if a system decoder is not
|
||||
// availble and the preferred GMP is available.
|
||||
@@ -1366,7 +1335,7 @@ pref("media.gmp.decoder.h264", 2);
|
||||
@@ -1365,7 +1334,7 @@ pref("media.gmp.decoder.h264", 2);
|
||||
|
||||
// Whether we should run a test-pattern through EME GMPs before assuming they'll
|
||||
// decode H.264.
|
||||
@ -213,7 +213,7 @@
|
||||
|
||||
// Note: when media.gmp-*.visible is true, provided we're running on a
|
||||
// supported platform/OS version, the corresponding CDM appears in the
|
||||
@@ -1376,19 +1345,15 @@ pref("media.gmp.trial-create.enabled", true);
|
||||
@@ -1375,19 +1344,15 @@ pref("media.gmp.trial-create.enabled", true);
|
||||
// to enable the CDM if its disabled; it's as if the keysystem is completely
|
||||
// unsupported.
|
||||
|
||||
@ -235,7 +235,7 @@
|
||||
|
||||
// Play with different values of the decay time and get telemetry,
|
||||
// 0 means to randomize (and persist) the experiment value in users' profiles,
|
||||
@@ -1404,25 +1369,21 @@ pref("browser.translation.engine", "bing");
|
||||
@@ -1403,25 +1368,21 @@ pref("browser.translation.engine", "bing");
|
||||
|
||||
// Telemetry settings.
|
||||
// Determines if Telemetry pings can be archived locally.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user