Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 526216 - mochitest-browser-chrome: crash in nsObjectFrame::IsOpaque while running browser_pluginnotification.js and test_crashing.html, r=josh

Browse Source 
--HG--
extra : rebase_source : 3f5677e9af8e5b9d54ac394d62cf8528487efa94
This commit is contained in:
Robert O'Callahan 2009-12-17 09:56:24 -05:00
parent d1646c0b10
commit 68ed19ae3a
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
layout/generic/nsObjectFrame.cpp
View File

@ -1263,25 +1263,23 @@ nsObjectFrame::IsOpaque() const
#if defined(XP_MACOSX)
return PR_FALSE;
#else
if (mInstanceOwner) {
NPWindow *window;
mInstanceOwner->GetWindow(window);
if (window->type == NPWindowTypeDrawable) {
// XXX we possibly should check NPPVpluginTransparentBool
// here to optimize for windowless but opaque plugins
if (mInstanceOwner) {
nsresult rv;
PRBool transparent = PR_FALSE;
nsCOMPtr<nsIPluginInstance> pi;
if (NS_SUCCEEDED(rv = mInstanceOwner->GetInstance(*getter_AddRefs(pi)))) {
pi->IsTransparent(&transparent);
return !transparent;
}
}
return PR_FALSE;
}
}
return PR_TRUE;
if (!mInstanceOwner)
return PR_FALSE;
NPWindow *window;
mInstanceOwner->GetWindow(window);
if (window->type != NPWindowTypeDrawable)
return PR_TRUE;
nsresult rv;
nsCOMPtr<nsIPluginInstance> pi;
rv = mInstanceOwner->GetInstance(*getter_AddRefs(pi));
if (NS_FAILED(rv) || !pi)
return PR_FALSE;
PRBool transparent = PR_FALSE;
pi->IsTransparent(&transparent);
return !transparent;
#endif
}