Add Google and Startpage, make Startpage default search engine

browser/app/profile/basilisk.js

@@ -391,11 +391,7 @@ pref("browser.tabs.loadDivertedInBackground", false);
 pref("browser.tabs.loadBookmarksInBackground", false);
 pref("browser.tabs.tabClipWidth", 140);
 pref("browser.tabs.animate", true);
-#ifdef UNIX_BUT_NOT_MAC
 pref("browser.tabs.drawInTitlebar", false);
-#else
-pref("browser.tabs.drawInTitlebar", true);
-#endif
 
 // When tabs opened by links in other tabs via a combination of
 // browser.link.open_newwindow being set to 3 and target="_blank" etc are

browser/components/preferences/in-content/content.xul

@@ -32,6 +32,17 @@
               name="media.peerconnection.enabled"
               type="bool"/>
 #endif
+
+  <!-- YouTube video codecs -->
+  <preference id="browser.video.youtube.hide-unaccelerated"
+              name="browser.video.youtube.hide-unaccelerated"
+              type="bool"/>
+  <preference id="browser.video.youtube.force-h264"
+              name="browser.video.youtube.force-h264"
+              type="bool"/>
+  <preference id="browser.video.youtube.disable-60fps"
+              name="browser.video.youtube.disable-60fps"
+              type="bool"/>
 </preferences>
 
 <script type="application/javascript"

browser/config/version.txt

@@ -1 +1 @@
-52.13.2.1
+52.14.0

browser/config/version_display.txt

@@ -1 +1 @@
-13.2.1
+14.0

browser/installer/package-manifest.in

@@ -627,6 +627,7 @@
 ; All the pref files must be part of base to prevent migration bugs
 @RESPATH@/browser/@PREF_DIR@/basilisk.js
 @RESPATH@/browser/@PREF_DIR@/basilisk-branding.js
+@RESPATH@/browser/@PREF_DIR@/internaluserscripts.js
 @RESPATH@/goanna.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/permissions

browser/locales/en-US/chrome/browser-region/region.properties

@@ -3,14 +3,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Default search engine
-browser.search.defaultenginename=DuckDuckGo
+browser.search.defaultenginename=Startpage
 
 # Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=DuckDuckGo
+browser.search.order.1=Startpage
-browser.search.order.2=DuckDuckGo (Lite)
+browser.search.order.2=Google
-browser.search.order.3=Yahoo
+browser.search.order.3=DuckDuckGo (Lite)
-browser.search.order.4=Bing
+browser.search.order.4=Yahoo
-browser.search.order.5=Ecosia
+browser.search.order.5=Bing
+browser.search.order.6=Ecosia
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI

browser/locales/search/list.json

@@ -1,7 +1,7 @@
 {
   "default": {
     "visibleDefaultEngines": [
-      "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
+      "startpage", "google-2018", "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
     ]
   },
   "regionOverrides": {
@@ -10,7 +10,7 @@
     "en-US": {
       "default": {
         "visibleDefaultEngines": [
-          "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
+          "startpage", "google-2018", "ddg", "ddg-lite", "yahoo", "bing", "wikipedia"
         ]
       }
     },

browser/locales/searchplugins/startpage.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+  <ShortName>Startpage</ShortName>
+  <Description>Startpage Search</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Image width="16" height="16">data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHJlY3Qgd2lkdGg9IjE2IiBoZWlnaHQ9IjE2IiByeD0iMyIgZmlsbD0iIzNiNGI5YiIvPjxwYXRoIGQ9Ik0xMi41IDQuM0MxMS43IDMuNSAxMC41IDMgOC44IDMgNi42IDMgNSA0LjIgNSA1LjljMCAxLjggMS41IDIuNCAzLjIgMi45IDEuNC40IDIuMS43IDIuMSAxLjQgMCAuNi0uNiAxLTEuNSAxLTEgMC0xLjgtLjQtMi41LTEuMUw1IDExLjVjLjkgMSAyLjEgMS41IDMuOCAxLjUgMi4zIDAgMy43LTEuMiAzLjctMyAwLTEuOS0xLjUtMi41LTMuMy0zLTEuMy0uNC0yLS43LTItMS4zIDAtLjUuNS0uOCAxLjQtLjguOSAwIDEuNi4zIDIuMy45eiIgZmlsbD0id2hpdGUiLz48L3N2Zz4=</Image>
+  <Url type="text/html" method="GET" template="https://www.startpage.com/sp/search">
+    <Param name="query" value="{searchTerms}"/>
+  </Url>
+</SearchPlugin>

toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm

@@ -25,6 +25,7 @@ const XMLURI_PARSE_ERROR              = "http://www.mozilla.org/newlayout/xml/pa
 
 const TOOLKIT_ID                      = "toolkit@mozilla.org";
 const FIREFOX_ID                      = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
+const PALEMOON_ID                     = "{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}";
 const FIREFOX_APPCOMPATVERSION        = "56.9"
 
 const PREF_UPDATE_REQUIREBUILTINCERTS = "extensions.update.requireBuiltInCerts";
@@ -534,6 +535,16 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
         maxVersion: getRequiredProperty(app, "max_version", "string"),
       }
     }
+    else if (PALEMOON_ID in applications) {
+      logger.debug("update.json: Pale Moon targetApplication");
+      app = getProperty(applications, PALEMOON_ID, "object");
+
+      appEntry = {
+        id: PALEMOON_ID,
+        minVersion: getRequiredProperty(app, "min_version", "string"),
+        maxVersion: getRequiredProperty(app, "max_version", "string"),
+      }
+    }
 #endif
     else if (TOOLKIT_ID in applications) {
       logger.debug("update.json: Toolkit targetApplication");
@@ -834,7 +845,7 @@ function matchesVersions(aUpdate, aAppVersion, aPlatformVersion,
              (aIgnoreMaxVersion || (Services.vc.compare(aAppVersion, app.maxVersion) <= 0));
     }
 #ifdef MOZ_PHOENIX_EXTENSIONS
-    if (app.id == FIREFOX_ID) {
+    if (app.id == FIREFOX_ID || app.id == PALEMOON_ID) {
       return (Services.vc.compare(aAppVersion, app.minVersion) >= 0) &&
              (aIgnoreMaxVersion || (Services.vc.compare(aAppVersion, app.maxVersion) <= 0));
     }
@@ -898,6 +909,7 @@ this.AddonUpdateChecker = {
             let id = targetApp.id;
 #ifdef MOZ_PHOENIX_EXTENSIONS
             if (id == Services.appinfo.ID || id == FIREFOX_ID ||
+                id == PALEMOON_ID ||
                 id == TOOLKIT_ID)
 #else
             if (id == Services.appinfo.ID || id == TOOLKIT_ID)

toolkit/mozapps/extensions/internal/XPIProvider.jsm

@@ -137,6 +137,9 @@ const PREFIX_NS_EM                    = "http://www.mozilla.org/2004/em-rdf#";
 const TOOLKIT_ID                      = "toolkit@mozilla.org";
 #ifdef MOZ_PHOENIX_EXTENSIONS
 const FIREFOX_ID                      = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+// Pale Moon's legacy application ID.  Basilisk and Dactyloidae use the
+// Firefox ID above, but extensions may still target Pale Moon explicitly.
+const PALEMOON_ID                     = "{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}"
 const FIREFOX_APPCOMPATVERSION        = "56.9"
 #endif
 
@@ -6417,6 +6420,13 @@ AddonInternal.prototype = {
         return false;
 #endif
     }
+#ifdef MOZ_PHOENIX_EXTENSIONS
+    else if (app.id == PALEMOON_ID) {
+      // Pale Moon extensions use the application's version range.
+      version = aAppVersion;
+      this.native = true;
+    }
+#endif
     else if (app.id == TOOLKIT_ID) {
       // For WebExtensions against toolkit, report as Firefox 128.0
       if (this.type == "extension") {
@@ -6449,7 +6459,8 @@ AddonInternal.prototype = {
       // Extremely old extensions should not be compatible by default.
       let minCompatVersion;
 #ifdef MOZ_PHOENIX_EXTENSIONS
-      if (app.id == Services.appinfo.ID || app.id == FIREFOX_ID)
+       if (app.id == Services.appinfo.ID || app.id == FIREFOX_ID ||
+           app.id == PALEMOON_ID)
 #else
       if (app.id == Services.appinfo.ID)
 #endif
@@ -6483,6 +6494,8 @@ AddonInternal.prototype = {
     for (let targetApp of this.targetApplications) {
       if (targetApp.id == FIREFOX_ID) //Firefox GUID
         return targetApp;
+      if (targetApp.id == PALEMOON_ID)
+        app = targetApp;
     }
 #endif
     // Return toolkit ID if toolkit.