Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out bug 1131136 part A (revision 9101eb40b8a6 and 9733e78176b2) for assertion failures on a CLOSED TREE

Browse Source
This commit is contained in:
Benjamin Smedberg 2015-02-10 13:28:25 -05:00
parent ae531aa683
commit e2d51dfba7
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dom/plugins/base/nsPluginHost.cpp
View File

@ -934,14 +934,6 @@ nsPluginHost::TrySetUpPluginInstance(const char *aMimeType,
PR_LogFlush();
#endif
#ifdef XP_WIN
bool changed;
if ((mRegKeyHKLM && NS_SUCCEEDED(mRegKeyHKLM->HasChanged(&changed)) && changed) ||
(mRegKeyHKCU && NS_SUCCEEDED(mRegKeyHKCU->HasChanged(&changed)) && changed)) {
ReloadPlugins();
}
#endif
nsRefPtr<nsNPAPIPlugin> plugin;
GetPlugin(aMimeType, getter_AddRefs(plugin));
if (!plugin) {
@ -2116,26 +2108,6 @@ nsPluginHost::SetChromeEpochForContent(uint32_t aEpoch)
mPluginEpoch = aEpoch;
}
#ifdef XP_WIN
static void
WatchRegKey(uint32_t aRoot, nsCOMPtr<nsIWindowsRegKey>& aKey)
{
MOZ_ASSERT(!aKey);
aKey = do_CreateInstance("@mozilla.org/windows-registry-key;1");
if (!aKey) {
return;
}
nsresult rv = aKey->Open(aRoot,
NS_LITERAL_STRING("Software\\MozillaPlugins"),
nsIWindowsRegKey::ACCESS_READ | nsIWindowsRegKey::ACCESS_NOTIFY);
if (NS_WARN_IF(NS_FAILED(rv))) {
aKey = nullptr;
return;
}
aKey->StartWatching(true);
}
#endif
nsresult nsPluginHost::LoadPlugins()
{
#ifdef ANDROID
@ -2151,11 +2123,6 @@ nsresult nsPluginHost::LoadPlugins()
if (mPluginsDisabled)
return NS_OK;
#ifdef XP_WIN
WatchRegKey(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE, mRegKeyHKLM);
WatchRegKey(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER, mRegKeyHKCU);
#endif
bool pluginschanged;
nsresult rv = FindPlugins(true, &pluginschanged);
if (NS_FAILED(rv))

9
dom/plugins/base/nsPluginHost.h
View File

@ -30,10 +30,6 @@
#include "nsCRT.h"
#include "mozilla/plugins/PluginTypes.h"
#ifdef XP_WIN
#include "nsIWindowsRegKey.h"
#endif
namespace mozilla {
namespace plugins {
class PluginAsyncSurrogate;
@ -330,11 +326,6 @@ private:
nsCOMPtr<nsIFile> mPluginRegFile;
#ifdef XP_WIN
nsRefPtr<nsPluginDirServiceProvider> mPrivateDirServiceProvider;
// In order to reload plugins when they change, we watch the registry via
// this object.
nsCOMPtr<nsIWindowsRegKey> mRegKeyHKLM;
nsCOMPtr<nsIWindowsRegKey> mRegKeyHKCU;
#endif
nsCOMPtr<nsIEffectiveTLDService> mTLDService;