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

Remove dead code from nsPluginInstanceOwner::GetPluginPort. (bug 1266513, r=jimm)

Browse Source
This commit is contained in:
David Anderson
2016-04-21 15:02:08 -04:00
parent a54d15b82b
commit b05aeeddb8
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@@ -3280,14 +3280,10 @@ nsresult nsPluginInstanceOwner::Init(nsIContent* aContent)
void* nsPluginInstanceOwner::GetPluginPort() void* nsPluginInstanceOwner::GetPluginPort()
{ {
//!!! Port must be released for windowless plugins on Windows, because it is HDC !!!
void* result = nullptr; void* result = nullptr;
if (mWidget) { if (mWidget) {
#ifdef XP_WIN #ifdef XP_WIN
if (mPluginWindow && (mPluginWindow->type == NPWindowTypeDrawable)) if (!mPluginWindow || mPluginWindow->type == NPWindowTypeWindow)
result = mWidget->GetNativeData(NS_NATIVE_GRAPHIC); // HDC
else
#endif #endif
result = mWidget->GetNativeData(NS_NATIVE_PLUGIN_PORT); // HWND/gdk window result = mWidget->GetNativeData(NS_NATIVE_PLUGIN_PORT); // HWND/gdk window
} }
@@ -3297,12 +3293,6 @@ void* nsPluginInstanceOwner::GetPluginPort()
void nsPluginInstanceOwner::ReleasePluginPort(void * pluginPort) void nsPluginInstanceOwner::ReleasePluginPort(void * pluginPort)
{ {
#ifdef XP_WIN
if (mWidget && mPluginWindow &&
mPluginWindow->type == NPWindowTypeDrawable) {
mWidget->FreeNativeData((HDC)pluginPort, NS_NATIVE_GRAPHIC);
}
#endif
} }
NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void) NS_IMETHODIMP nsPluginInstanceOwner::CreateWidget(void)