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

Back out bug 653083 because of crashtest crashes (bug698862.html) in PluginInstanceParent::GetNPP for a crashed plugin

Browse Source
This commit is contained in:
Benjamin Smedberg
2011-06-16 13:22:24 -04:00
parent 2e43a3b279
commit db0bb30d65
18 changed files with 143 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dom/plugins/ipc/PluginScriptableObjectChild.cpp
View File

@@ -42,10 +42,6 @@
using namespace mozilla::plugins;
namespace {
typedef PluginIdentifierChild::StackIdentifier StackIdentifier;
}
// static
NPObject*
PluginScriptableObjectChild::ScriptableAllocate(NPP aInstance,
@@ -664,7 +660,7 @@ PluginScriptableObjectChild::AnswerHasMethod(PPluginIdentifierChild* aId,
return true;
}
StackIdentifier id(aId);
PluginIdentifierChild* id = static_cast<PluginIdentifierChild*>(aId);
*aHasMethod = mObject->_class->hasMethod(mObject, id->ToNPIdentifier());
return true;
}
@@ -708,7 +704,7 @@ PluginScriptableObjectChild::AnswerInvoke(PPluginIdentifierChild* aId,
NPVariant result;
VOID_TO_NPVARIANT(result);
StackIdentifier id(aId);
PluginIdentifierChild* id = static_cast<PluginIdentifierChild*>(aId);
bool success = mObject->_class->invoke(mObject, id->ToNPIdentifier(),
convertedArgs.Elements(), argCount,
&result);
@@ -829,7 +825,7 @@ PluginScriptableObjectChild::AnswerHasProperty(PPluginIdentifierChild* aId,
return true;
}
StackIdentifier id(aId);
PluginIdentifierChild* id = static_cast<PluginIdentifierChild*>(aId);
*aHasProperty = mObject->_class->hasProperty(mObject, id->ToNPIdentifier());
return true;
}
@@ -859,8 +855,7 @@ PluginScriptableObjectChild::AnswerGetChildProperty(PPluginIdentifierChild* aId,
return true;
}
StackIdentifier stackID(aId);
NPIdentifier id = stackID->ToNPIdentifier();
NPIdentifier id = static_cast<PluginIdentifierChild*>(aId)->ToNPIdentifier();
*aHasProperty = mObject->_class->hasProperty(mObject, id);
*aHasMethod = mObject->_class->hasMethod(mObject, id);
@@ -906,8 +901,7 @@ PluginScriptableObjectChild::AnswerSetProperty(PPluginIdentifierChild* aId,
return true;
}
StackIdentifier stackID(aId);
NPIdentifier id = stackID->ToNPIdentifier();
NPIdentifier id = static_cast<PluginIdentifierChild*>(aId)->ToNPIdentifier();
if (!mObject->_class->hasProperty(mObject, id)) {
*aSuccess = false;
@@ -944,8 +938,7 @@ PluginScriptableObjectChild::AnswerRemoveProperty(PPluginIdentifierChild* aId,
return true;
}
StackIdentifier stackID(aId);
NPIdentifier id = stackID->ToNPIdentifier();
NPIdentifier id = static_cast<PluginIdentifierChild*>(aId)->ToNPIdentifier();
*aSuccess = mObject->_class->hasProperty(mObject, id) ?
mObject->_class->removeProperty(mObject, id) :
true;