From 6a2ff38f0fb2ed00e96a1a3d4cd2c655774e87fe Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Thu, 25 Oct 2018 18:12:58 -0400 Subject: Issue #795 - Make nsIUserInfo component optional This allows the nsIUserinfo component to be disabled with --disable-userinfo in mozconfig at build time, but leaves it on by default to avoid any compatibility issues in existing applications. --- toolkit/components/build/nsToolkitCompsModule.cpp | 10 ++++++++++ toolkit/components/startup/moz.build | 21 ++++++++------------- toolkit/components/startup/public/moz.build | 8 ++++---- 3 files changed, 22 insertions(+), 17 deletions(-) (limited to 'toolkit') diff --git a/toolkit/components/build/nsToolkitCompsModule.cpp b/toolkit/components/build/nsToolkitCompsModule.cpp index 190c4da06..33c604c4e 100644 --- a/toolkit/components/build/nsToolkitCompsModule.cpp +++ b/toolkit/components/build/nsToolkitCompsModule.cpp @@ -5,7 +5,9 @@ #include "mozilla/ModuleUtils.h" #include "nsAppStartup.h" #include "nsNetCID.h" +#ifdef MOZ_USERINFO #include "nsUserInfo.h" +#endif #include "nsToolkitCompsCID.h" #include "nsFindService.h" #if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID) @@ -76,7 +78,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPerformanceStatsService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsTerminator) #endif +#if defined(MOZ_USERINFO) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo) +#endif // defined (MOZ_USERINFO) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService) #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) @@ -141,7 +145,9 @@ NS_DEFINE_NAMED_CID(NS_TOOLKIT_PERFORMANCESTATSSERVICE_CID); #if defined(MOZ_HAS_TERMINATOR) NS_DEFINE_NAMED_CID(NS_TOOLKIT_TERMINATOR_CID); #endif +#if defined(MOZ_USERINFO) NS_DEFINE_NAMED_CID(NS_USERINFO_CID); +#endif // defined (MOZ_USERINFO) NS_DEFINE_NAMED_CID(ALERT_NOTIFICATION_CID); NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID); #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) @@ -179,7 +185,9 @@ static const Module::CIDEntry kToolkitCIDs[] = { #if defined(MOZ_HAS_PERFSTATS) { &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID, false, nullptr, nsPerformanceStatsServiceConstructor }, #endif // defined (MOZ_HAS_PERFSTATS) +#if defined(MOZ_USERINFO) { &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor }, +#endif // defined (MOZ_USERINFO) { &kALERT_NOTIFICATION_CID, false, nullptr, AlertNotificationConstructor }, { &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor }, #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) @@ -219,7 +227,9 @@ static const Module::ContractIDEntry kToolkitContracts[] = { #if defined(MOZ_HAS_PERFSTATS) { NS_TOOLKIT_PERFORMANCESTATSSERVICE_CONTRACTID, &kNS_TOOLKIT_PERFORMANCESTATSSERVICE_CID }, #endif // defined (MOZ_HAS_PERFSTATS) +#if defined(MOZ_USERINFO) { NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID }, +#endif // defined(MOZ_USERINFO) { ALERT_NOTIFICATION_CONTRACTID, &kALERT_NOTIFICATION_CID }, { NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID }, #if !defined(MOZ_DISABLE_PARENTAL_CONTROLS) diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index dbd580384..5f290b783 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -18,19 +18,14 @@ UNIFIED_SOURCES += [ 'StartupTimeline.cpp', ] -if CONFIG['OS_ARCH'] == 'WINNT': - # This file cannot be built in unified mode because of name clashes with Windows headers. - SOURCES += [ - 'nsUserInfoWin.cpp', - ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ - 'nsUserInfoMac.mm', - ] -else: - UNIFIED_SOURCES += [ - 'nsUserInfoUnix.cpp', - ] +if CONFIG['MOZ_USERINFO']: + if CONFIG['OS_ARCH'] == 'WINNT': + # This file cannot be built in unified mode because of name clashes with Windows headers. + SOURCES += ['nsUserInfoWin.cpp'] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + UNIFIED_SOURCES += ['nsUserInfoMac.mm'] + else: + UNIFIED_SOURCES += ['nsUserInfoUnix.cpp'] FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/startup/public/moz.build b/toolkit/components/startup/public/moz.build index 5894b6c51..948a7d7ee 100644 --- a/toolkit/components/startup/public/moz.build +++ b/toolkit/components/startup/public/moz.build @@ -4,10 +4,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -XPIDL_SOURCES += [ - 'nsIAppStartup.idl', - 'nsIUserInfo.idl', -] +XPIDL_SOURCES += ['nsIAppStartup.idl'] + +if CONFIG['MOZ_USERINFO']: + XPIDL_SOURCES += ['nsIUserInfo.idl'] XPIDL_MODULE = 'appstartup' -- cgit v1.2.3 From 6bdbb9cdf663578619671e6f923c665349b9a2ac Mon Sep 17 00:00:00 2001 From: JustOff Date: Sat, 27 Oct 2018 21:35:56 +0300 Subject: Use a separate process to generate thumbnails only when multi-process mode is enabled --- toolkit/components/thumbnails/BackgroundPageThumbs.jsm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'toolkit') diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm index 7b86fa07c..3eec9827d 100644 --- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm +++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm @@ -206,9 +206,13 @@ const BackgroundPageThumbs = { let browser = this._parentWin.document.createElementNS(XUL_NS, "browser"); browser.setAttribute("type", "content"); - browser.setAttribute("remote", "true"); browser.setAttribute("disableglobalhistory", "true"); + if (Services.prefs.getPrefType("browser.tabs.remote") == Services.prefs.PREF_BOOL && + Services.prefs.getBoolPref("browser.tabs.remote")) { + browser.setAttribute("remote", "true"); + } + if (Services.prefs.getBoolPref(ABOUT_NEWTAB_SEGREGATION_PREF)) { // Use the private container for thumbnails. let privateIdentity = -- cgit v1.2.3 From 16e5a6bc2b4e3694afdd865660b00be64578fa89 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Mon, 18 Jun 2018 12:21:11 +0200 Subject: [PALEMOON] Re-apply removal of unnecessary code (Findbar is no longer in the gBrowser) This resolves #793 --- toolkit/content/browser-content.js | 29 ----------------------------- toolkit/content/jar.mn | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) (limited to 'toolkit') diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js index e1114672c..2276f8a0d 100644 --- a/toolkit/content/browser-content.js +++ b/toolkit/content/browser-content.js @@ -841,35 +841,6 @@ var FindBar = { fakeEvent[k] = event[k]; } } -#ifdef MC_PALEMOON - let findBarId = "FindToolbar"; - // The FindBar is in the chrome window's context, not in tabbrowser - // - see also bug 537013 - let chromeWin = null; - try { - chromeWin = content - .QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIWebNavigation) - .QueryInterface(Ci.nsIDocShellTreeItem) - .rootTreeItem - .QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindow) - .QueryInterface(Ci.nsIDOMChromeWindow); - } catch (e) { - Cu.reportError( - "The FindBar - the chrome window's context was not detected:\n" + e); - } - if (chromeWin && chromeWin.document.getElementById(findBarId)) { - try { - chromeWin.document.getElementById(findBarId) - .browser = Services.wm.getMostRecentWindow("navigator:browser") - .gBrowser.mCurrentBrowser; - } catch (e) { - Cu.reportError( - "The FindBar - cannot set the property 'browser':\n" + e); - } - } -#endif // sendSyncMessage returns an array of the responses from all listeners let rv = sendSyncMessage("Findbar:Keypress", { diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index c11d3abed..e1d432cb3 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -39,7 +39,7 @@ toolkit.jar: content/global/plugins.html content/global/plugins.css content/global/browser-child.js -* content/global/browser-content.js + content/global/browser-content.js * content/global/buildconfig.html content/global/contentAreaUtils.js #ifndef MOZ_FENNEC -- cgit v1.2.3 From 6a9c2be4eac174c1b44ffb0ff16fd32fca92aa18 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 20 Nov 2018 11:10:18 +0100 Subject: Update package.json Update request version dependency --- toolkit/components/microformats/update/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit') diff --git a/toolkit/components/microformats/update/package.json b/toolkit/components/microformats/update/package.json index 8f829439f..371986694 100644 --- a/toolkit/components/microformats/update/package.json +++ b/toolkit/components/microformats/update/package.json @@ -16,6 +16,6 @@ "dependencies": { "download-github-repo": "0.1.x", "fs-extra": "0.19.x", - "request": "2.58.x" + "request": ">=2.68.0" } -} \ No newline at end of file +} -- cgit v1.2.3 From fe11e14d3cfc2900facf152257acda87280b6cdc Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 27 Nov 2018 17:05:46 -0500 Subject: [TychoAM] Give the second an ID so it can be targeted in extensions.xul --- toolkit/mozapps/extensions/content/extensions.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolkit') diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index c5eeb534f..292ecf8d3 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -186,7 +186,7 @@ placeholder="&search.placeholder;"/> - + -- cgit v1.2.3