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

Backed out changeset 8c69c6e6fc39 (bug 942633) for build failures on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley
2013-11-26 17:30:55 +00:00
parent 12aaca901b
commit 64b44683a3
20 changed files with 54 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,10 @@
using namespace mozilla::plugins;
namespace {
typedef PluginIdentifierChild::StackIdentifier StackIdentifier;
}
// static
NPObject*
PluginScriptableObjectChild::ScriptableAllocate(NPP aInstance,
@@ -628,7 +632,7 @@ PluginScriptableObjectChild::AnswerHasMethod(PPluginIdentifierChild* aId,
return true;
}
PluginIdentifierChild::StackIdentifier id(aId);
StackIdentifier id(aId);
*aHasMethod = mObject->_class->hasMethod(mObject, id->ToNPIdentifier());
return true;
}
@@ -672,7 +676,7 @@ PluginScriptableObjectChild::AnswerInvoke(PPluginIdentifierChild* aId,
NPVariant result;
VOID_TO_NPVARIANT(result);
PluginIdentifierChild::StackIdentifier id(aId);
StackIdentifier id(aId);
bool success = mObject->_class->invoke(mObject, id->ToNPIdentifier(),
convertedArgs.Elements(), argCount,
&result);
@@ -793,7 +797,7 @@ PluginScriptableObjectChild::AnswerHasProperty(PPluginIdentifierChild* aId,
return true;
}
PluginIdentifierChild::StackIdentifier id(aId);
StackIdentifier id(aId);
*aHasProperty = mObject->_class->hasProperty(mObject, id->ToNPIdentifier());
return true;
}
@@ -823,7 +827,7 @@ PluginScriptableObjectChild::AnswerGetChildProperty(PPluginIdentifierChild* aId,
return true;
}
PluginIdentifierChild::StackIdentifier stackID(aId);
StackIdentifier stackID(aId);
NPIdentifier id = stackID->ToNPIdentifier();
*aHasProperty = mObject->_class->hasProperty(mObject, id);
@@ -870,7 +874,7 @@ PluginScriptableObjectChild::AnswerSetProperty(PPluginIdentifierChild* aId,
return true;
}
PluginIdentifierChild::StackIdentifier stackID(aId);
StackIdentifier stackID(aId);
NPIdentifier id = stackID->ToNPIdentifier();
if (!mObject->_class->hasProperty(mObject, id)) {
@@ -908,7 +912,7 @@ PluginScriptableObjectChild::AnswerRemoveProperty(PPluginIdentifierChild* aId,
return true;
}
PluginIdentifierChild::StackIdentifier stackID(aId);
StackIdentifier stackID(aId);
NPIdentifier id = stackID->ToNPIdentifier();
*aSuccess = mObject->_class->hasProperty(mObject, id) ?
mObject->_class->removeProperty(mObject, id) :