author | Nicholas Nethercote <nnethercote@mozilla.com> |
Tue, 18 Apr 2017 16:56:45 +1000 | |
changeset 367582 | 2ea30798f7ba85aa5073af8dca2d560abe201d70 |
parent 367581 | 6b0f6053943f47823620aa32da53f6e5b5263ef3 |
child 367583 | ae7695ceea329fb25d37f03175c51416815af61e |
push id | 32137 |
push user | cbook@mozilla.com |
push date | Thu, 06 Jul 2017 09:18:21 +0000 |
treeherder | mozilla-central@018b3829d0a7 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jimm |
bugs | 1352575 |
milestone | 56.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
dom/plugins/ipc/PluginModuleParent.cpp | file | annotate | diff | comparison | revisions | |
dom/plugins/ipc/PluginModuleParent.h | file | annotate | diff | comparison | revisions |
--- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -607,17 +607,16 @@ PluginModuleParent::PluginModuleParent(b , mClearSiteDataSupported(false) , mGetSitesWithDataSupported(false) , mNPNIface(nullptr) , mNPPIface(nullptr) , mPlugin(nullptr) , mTaskFactory(this) , mSandboxLevel(0) , mIsFlashPlugin(false) - , mNPInitialized(false) , mIsNPShutdownPending(false) , mAsyncNewRv(NS_ERROR_NOT_INITIALIZED) #ifdef MOZ_CRASHREPORTER , mCrashReporterMutex("PluginModuleChromeParent::mCrashReporterMutex") #endif { } @@ -2180,17 +2179,16 @@ PluginModuleChromeParent::NP_Initialize( if (*error != NPERR_NO_ERROR) { OnInitFailure(); return NS_OK; } SetPluginFuncs(mNPPIface); - mNPInitialized = true; return NS_OK; } #else nsresult PluginModuleParent::NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error) { @@ -2261,17 +2259,16 @@ PluginModuleChromeParent::NP_Initialize( return NS_ERROR_FAILURE; } if (*error != NPERR_NO_ERROR) { OnInitFailure(); return NS_OK; } - mNPInitialized = true; return NS_OK; } #endif nsresult PluginModuleParent::NP_Shutdown(NPError* error) {
--- a/dom/plugins/ipc/PluginModuleParent.h +++ b/dom/plugins/ipc/PluginModuleParent.h @@ -91,19 +91,16 @@ protected: virtual bool DeallocPPluginInstanceParent(PPluginInstanceParent* aActor) override; public: explicit PluginModuleParent(bool aIsChrome); virtual ~PluginModuleParent(); - /** @return whether this modules NP_Initialize has successfully completed - executing */ - bool IsInitialized() const { return mNPInitialized; } bool IsChrome() const { return mIsChrome; } virtual void SetPlugin(nsNPAPIPlugin* plugin) override { mPlugin = plugin; } virtual void ActorDestroy(ActorDestroyReason why) override; @@ -338,17 +335,16 @@ protected: // Dup of plugin's X socket, used to scope its resources to this // object instead of the plugin process's lifetime ScopedClose mPluginXSocketFdDup; #endif bool GetPluginDetails(); - bool mNPInitialized; bool mIsNPShutdownPending; nsresult mAsyncNewRv; uint32_t mRunID; RefPtr<layers::TextureClientRecycleAllocator> mTextureAllocatorForDirectBitmap; RefPtr<layers::TextureClientRecycleAllocator> mTextureAllocatorForDXGISurface; #ifdef MOZ_CRASHREPORTER