diff --git a/dom/plugins/base/nsPluginDirServiceProvider.cpp b/dom/plugins/base/nsPluginDirServiceProvider.cpp index 374b60906211..d78f2826c38a 100644 --- a/dom/plugins/base/nsPluginDirServiceProvider.cpp +++ b/dom/plugins/base/nsPluginDirServiceProvider.cpp @@ -211,47 +211,7 @@ nsPluginDirServiceProvider::GetFile(const char *charProp, bool *persistant, do_CreateInstance("@mozilla.org/windows-registry-key;1"); NS_ENSURE_TRUE(regKey, NS_ERROR_FAILURE); - if (nsCRT::strcmp(charProp, NS_WIN_QUICKTIME_SCAN_KEY) == 0) { - nsAdoptingCString strVer = Preferences::GetCString(charProp); - if (!strVer) { - return NS_ERROR_FAILURE; - } - verBlock minVer; - TranslateVersionStr(NS_ConvertASCIItoUTF16(strVer).get(), &minVer); - - // Look for the Quicktime system installation plugins directory - verBlock qtVer; - ClearVersion(&qtVer); - - // First we need to check the version of Quicktime via checking - // the EXE's version table - rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE, - NS_LITERAL_STRING("software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\QuickTimePlayer.exe"), - nsIWindowsRegKey::ACCESS_READ); - if (NS_SUCCEEDED(rv)) { - nsAutoString path; - rv = regKey->ReadStringValue(NS_LITERAL_STRING(""), path); - if (NS_SUCCEEDED(rv)) { - GetFileVersion(path.get(), &qtVer); - } - regKey->Close(); - } - if (CompareVersion(qtVer, minVer) < 0) - return rv; - - rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE, - NS_LITERAL_STRING("software\\Apple Computer, Inc.\\QuickTime"), - nsIWindowsRegKey::ACCESS_READ); - if (NS_SUCCEEDED(rv)) { - nsAutoString path; - rv = regKey->ReadStringValue(NS_LITERAL_STRING("InstallDir"), path); - if (NS_SUCCEEDED(rv)) { - path += NS_LITERAL_STRING("\\Plugins"); - rv = NS_NewLocalFile(path, true, - getter_AddRefs(localFile)); - } - } - } else if (nsCRT::strcmp(charProp, NS_WIN_WMP_SCAN_KEY) == 0) { + if (nsCRT::strcmp(charProp, NS_WIN_WMP_SCAN_KEY) == 0) { nsAdoptingCString strVer = Preferences::GetCString(charProp); if (!strVer) { return NS_ERROR_FAILURE; diff --git a/dom/plugins/base/nsPluginDirServiceProvider.h b/dom/plugins/base/nsPluginDirServiceProvider.h index 11bb8943edc2..dd9db97200ab 100644 --- a/dom/plugins/base/nsPluginDirServiceProvider.h +++ b/dom/plugins/base/nsPluginDirServiceProvider.h @@ -16,7 +16,6 @@ class nsISimpleEnumerator; // Note: Our directory service provider scan keys are prefs which are check // for minimum versions compatibility -#define NS_WIN_QUICKTIME_SCAN_KEY "plugin.scan.Quicktime" #define NS_WIN_WMP_SCAN_KEY "plugin.scan.WindowsMediaPlayer" //***************************************************************************** diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 0813fa1bc81d..e6db1d03ff31 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -2555,8 +2555,7 @@ nsresult nsPluginHost::FindPlugins(bool aCreatePluginList, bool * aPluginsChange // Scan the installation paths of our popular plugins if the prefs are enabled // This table controls the order of scanning - const char* const prefs[] = {NS_WIN_QUICKTIME_SCAN_KEY, - NS_WIN_WMP_SCAN_KEY}; + const char* const prefs[] = {NS_WIN_WMP_SCAN_KEY}; uint32_t size = sizeof(prefs) / sizeof(prefs[0]); diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp index af9db9103ba9..44c87c46221f 100644 --- a/dom/plugins/ipc/PluginInstanceChild.cpp +++ b/dom/plugins/ipc/PluginInstanceChild.cpp @@ -1357,11 +1357,6 @@ PluginInstanceChild::AnswerNPP_SetWindow(const NPRemoteWindow& aWindow) switch (aWindow.type) { case NPWindowTypeWindow: { - // This check is now done in PluginInstanceParent before this call, so - // we should never see it here. - MOZ_ASSERT(!(GetQuirks() & QUIRK_QUICKTIME_AVOID_SETWINDOW) || - aWindow.width != 0 || aWindow.height != 0); - MOZ_ASSERT(mPluginWindowHWND, "Child plugin window must exist before call to SetWindow"); diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp index 4f10ae306acb..a2bad85f9bfc 100644 --- a/dom/plugins/ipc/PluginInstanceParent.cpp +++ b/dom/plugins/ipc/PluginInstanceParent.cpp @@ -1337,12 +1337,6 @@ PluginInstanceParent::NPP_SetWindow(const NPWindow* aWindow) } else { SubclassPluginWindow(reinterpret_cast(aWindow->window)); - // Skip SetWindow call for hidden QuickTime plugins. - if ((mParent->GetQuirks() & QUIRK_QUICKTIME_AVOID_SETWINDOW) && - aWindow->width == 0 && aWindow->height == 0) { - return NPERR_NO_ERROR; - } - window.window = reinterpret_cast(aWindow->window); window.x = aWindow->x; window.y = aWindow->y; diff --git a/dom/plugins/ipc/PluginQuirks.cpp b/dom/plugins/ipc/PluginQuirks.cpp index c60cf8836287..9bd642eab090 100644 --- a/dom/plugins/ipc/PluginQuirks.cpp +++ b/dom/plugins/ipc/PluginQuirks.cpp @@ -41,21 +41,10 @@ int GetQuirksFromMimeTypeAndFilename(const nsCString& aMimeType, #endif } -#ifdef OS_WIN - // QuickTime plugin usually loaded with audio/mpeg mimetype - NS_NAMED_LITERAL_CSTRING(quicktime, "npqtplugin"); - if (FindInReadable(quicktime, aPluginFilename)) { - quirks |= QUIRK_QUICKTIME_AVOID_SETWINDOW; - } -#endif - #ifdef XP_MACOSX - // Whitelist Flash and Quicktime to support offline renderer - NS_NAMED_LITERAL_CSTRING(quicktime, "QuickTime Plugin.plugin"); + // Whitelist Flash to support offline renderer. if (specialType == nsPluginHost::eSpecialType_Flash) { quirks |= QUIRK_ALLOW_OFFLINE_RENDERER; - } else if (FindInReadable(quicktime, aPluginFilename)) { - quirks |= QUIRK_ALLOW_OFFLINE_RENDERER; } #endif diff --git a/dom/plugins/ipc/PluginQuirks.h b/dom/plugins/ipc/PluginQuirks.h index f0a6b6a3054a..5aa16d565f71 100644 --- a/dom/plugins/ipc/PluginQuirks.h +++ b/dom/plugins/ipc/PluginQuirks.h @@ -37,9 +37,6 @@ enum PluginQuirks { // Win: Addresses a flash bug with mouse capture and full screen // windows. QUIRK_FLASH_FIXUP_MOUSE_CAPTURE = 1 << 6, - // Win: QuickTime steals focus on SetWindow calls even if it's hidden. - // Avoid calling SetWindow in that case. - QUIRK_QUICKTIME_AVOID_SETWINDOW = 1 << 7, // Win: Check to make sure the parent window has focus before calling // set focus on the child. Addresses a full screen dialog prompt // problem in Silverlight. diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp index 8057ee25dc60..acfe92b9cf61 100644 --- a/ipc/glue/WindowsMessageLoop.cpp +++ b/ipc/glue/WindowsMessageLoop.cpp @@ -494,10 +494,8 @@ WindowIsDeferredWindow(HWND hWnd) // Plugin windows that can trigger ipc calls in child: // 'ShockwaveFlashFullScreen' - flash fullscreen window - // 'QTNSHIDDEN' - QuickTime // 'AGFullScreenWinClass' - silverlight fullscreen window if (className.EqualsLiteral("ShockwaveFlashFullScreen") || - className.EqualsLiteral("QTNSHIDDEN") || className.EqualsLiteral("AGFullScreenWinClass")) { SetPropW(hWnd, k3rdPartyWindowProp, (HANDLE)1); return true; diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 79c1aa40a6da..dc5621dc88e4 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3435,9 +3435,6 @@ pref("print.print_extra_margin", 90); // twips (90 twips is an eigth of an inch) // Whether to extend the native dialog with information on printing frames. pref("print.extend_native_print_dialog", true); -// Locate plugins by scanning the Quicktime installation directory with a minimum version -pref("plugin.scan.Quicktime", "5.0"); - // Locate and scan the Window Media Player installation directory for plugins with a minimum version pref("plugin.scan.WindowsMediaPlayer", "7.0");