corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 797100: Replace internal usage of nsIPluginInstanceOwner with nsPluginInstanceOwner. r=jst

Browse Source
This commit is contained in:
Josh Aas
2012-10-02 22:43:18 -04:00
parent fcc6855939
commit 677edac3b7
10 changed files with 72 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -23,6 +23,7 @@
#include "nsIServiceManager.h"
#include "nsThreadUtils.h"
#include "mozilla/Preferences.h"
#include "nsPluginInstanceOwner.h"
#include "nsPluginsDir.h"
#include "nsPluginSafety.h"
@@ -624,8 +625,7 @@ GetDocumentFromNPP(NPP npp)
PluginDestructionGuard guard(inst);
nsCOMPtr<nsIPluginInstanceOwner> owner;
inst->GetOwner(getter_AddRefs(owner));
nsRefPtr<nsPluginInstanceOwner> owner = inst->GetOwner();
NS_ENSURE_TRUE(owner, nullptr);
nsCOMPtr<nsIDocument> doc;
@@ -1941,8 +1941,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance *) npp->ndata;
nsCOMPtr<nsIPluginInstanceOwner> owner;
inst->GetOwner(getter_AddRefs(owner));
nsRefPtr<nsPluginInstanceOwner> owner = inst->GetOwner();
NS_ENSURE_TRUE(owner, NPERR_NO_ERROR);
if (NS_SUCCEEDED(owner->GetNetscapeWindow(result))) {