Merge branch 'master' into Basilisk-releasev2018.12.18

8 files changed, 4 insertions, 89 deletions

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
+}
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
diff --git a/toolkit/library/dummydll/dummydll.cpp b/toolkit/library/dummydll/dummydll.cpp
deleted file mode 100644
index 5e1c04bd3..000000000
--- a/toolkit/library/dummydll/dummydll.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 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/. */
-
-#include <windows.h>
-
-BOOL WINAPI DllMain(
-  HANDLE hModule,
-  DWORD dwReason,
-  LPVOID lpvReserved
-)
-{
-  if (dwReason == DLL_PROCESS_ATTACH) {
-    ::DisableThreadLibraryCalls((HMODULE)hModule);
-  }
-  return TRUE;
-}
diff --git a/toolkit/library/dummydll/moz.build b/toolkit/library/dummydll/moz.build
deleted file mode 100644
index 01a0ddba8..000000000
--- a/toolkit/library/dummydll/moz.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-# Bug 1294650 - populate our install with a shim dll to work around a
-# 3rd party code injection crash.
-
-SOURCES += [
-    'dummydll.cpp',
-]
-
-if CONFIG['CPU_ARCH'] == 'x86_64':
-  GeckoSharedLibrary('qipcap64')
-else:
-  GeckoSharedLibrary('qipcap')
-
-NO_VISIBILITY_FLAGS = True
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 71f9a86de..5191b5a21 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -106,9 +106,6 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
 
 DIRS += ['gtest']
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-  DIRS += ['dummydll']
-
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [
@@ -177,14 +174,6 @@ if CONFIG['MOZ_WMF']:
         'strmiids',
     ]
 
-if CONFIG['MOZ_DIRECTSHOW']:
-    OS_LIBS += [
-        'dmoguids',
-        'wmcodecdspuuid',
-        'strmiids',
-        'msdmo',
-    ]
-
 if CONFIG['OS_ARCH'] == 'FreeBSD':
     OS_LIBS += [
         'util',
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;"/>
   </hbox>
 
-  <hbox flex="1">
+  <hbox id="main" flex="1">
 
     <!-- category list -->
     <richlistbox id="categories">
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index b4aebbef0..da4e7cd85 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -58,15 +58,6 @@ if CONFIG['MOZ_WEBRTC']:
         '/media/mtransport',
     ]
 
-if CONFIG['MOZ_OMX_PLUGIN']:
-    DIRS += [
-        '/media/omx-plugin/lib/ics/libutils',
-        '/media/omx-plugin/lib/ics/libstagefright',
-        '/media/omx-plugin/lib/ics/libvideoeditorplayer',
-        '/media/omx-plugin',
-        '/media/omx-plugin/kk',
-    ]
-
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['/testing/specialpowers']