Backed out changeset 8b4e4083639e (bug 1171931) for B2G debug emulator bustage.

This commit is contained in:
Ryan VanderMeulen
2015-06-25 19:48:42 -04:00
parent 26cddc3bad
commit 7aba9d7002
201 changed files with 579 additions and 506 deletions

View File

@@ -1856,7 +1856,7 @@ PluginInstanceParent::SubclassPluginWindow(HWND aWnd)
return;
}
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
if (!aWnd) {
NS_WARNING("PluginInstanceParent::SubclassPluginWindow unexpected null window");
return;
@@ -1886,7 +1886,7 @@ PluginInstanceParent::SubclassPluginWindow(HWND aWnd)
void
PluginInstanceParent::UnsubclassPluginWindow()
{
if (XRE_IsContentProcess()) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
if (mPluginHWND) {
// Remove 'this' from the plugin list safely
nsAutoPtr<PluginInstanceParent> tmp;