diff options
Diffstat (limited to 'WebKit/mac/Plugins/Hosted')
| -rw-r--r-- | WebKit/mac/Plugins/Hosted/ProxyInstance.h | 6 | ||||
| -rw-r--r-- | WebKit/mac/Plugins/Hosted/ProxyInstance.mm | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/WebKit/mac/Plugins/Hosted/ProxyInstance.h index c8fb118..b72e49a 100644 --- a/WebKit/mac/Plugins/Hosted/ProxyInstance.h +++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.h @@ -64,10 +64,10 @@ private: virtual JSC::Bindings::Class* getClass() const; virtual JSC::JSValue getMethod(JSC::ExecState* exec, const JSC::Identifier& propertyName); - virtual JSC::JSValue invokeMethod(JSC::ExecState*, JSC::RuntimeMethod*, const JSC::ArgList& args); + virtual JSC::JSValue invokeMethod(JSC::ExecState*, JSC::RuntimeMethod*); virtual bool supportsInvokeDefaultMethod() const; - virtual JSC::JSValue invokeDefaultMethod(JSC::ExecState*, const JSC::ArgList&); + virtual JSC::JSValue invokeDefaultMethod(JSC::ExecState*); virtual bool supportsConstruct() const; virtual JSC::JSValue invokeConstruct(JSC::ExecState*, const JSC::ArgList&); @@ -81,7 +81,7 @@ private: JSC::JSValue numberValue(JSC::ExecState*) const; JSC::JSValue booleanValue() const; - JSC::JSValue invoke(JSC::ExecState*, InvokeType, uint64_t identifier, const JSC::ArgList& args); + JSC::JSValue invoke(JSC::ExecState*, InvokeType, uint64_t identifier, const JSC::ArgList&); template <typename T> std::auto_ptr<T> waitForReply(uint32_t requestID) const { diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.mm b/WebKit/mac/Plugins/Hosted/ProxyInstance.mm index b569a4f..b9a674d 100644 --- a/WebKit/mac/Plugins/Hosted/ProxyInstance.mm +++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.mm @@ -141,7 +141,7 @@ JSC::Bindings::Class* ProxyInstance::getClass() const return proxyClass(); } -JSValue ProxyInstance::invoke(JSC::ExecState* exec, InvokeType type, uint64_t identifier, const JSC::ArgList& args) +JSValue ProxyInstance::invoke(JSC::ExecState* exec, InvokeType type, uint64_t identifier, const ArgList& args) { if (!m_instanceProxy) return jsUndefined(); @@ -196,7 +196,7 @@ JSValue ProxyInstance::getMethod(JSC::ExecState* exec, const JSC::Identifier& pr return new (exec) ProxyRuntimeMethod(exec, exec->lexicalGlobalObject(), propertyName, methodList); } -JSValue ProxyInstance::invokeMethod(ExecState* exec, JSC::RuntimeMethod* runtimeMethod, const ArgList& args) +JSValue ProxyInstance::invokeMethod(ExecState* exec, JSC::RuntimeMethod* runtimeMethod) { if (!asObject(runtimeMethod)->inherits(&ProxyRuntimeMethod::s_info)) return throwError(exec, TypeError, "Attempt to invoke non-plug-in method on plug-in object."); @@ -207,7 +207,7 @@ JSValue ProxyInstance::invokeMethod(ExecState* exec, JSC::RuntimeMethod* runtime ProxyMethod* method = static_cast<ProxyMethod*>(methodList[0]); - return invoke(exec, Invoke, method->serverIdentifier(), args); + return invoke(exec, Invoke, method->serverIdentifier(), ArgList(exec)); } bool ProxyInstance::supportsInvokeDefaultMethod() const @@ -228,10 +228,10 @@ bool ProxyInstance::supportsInvokeDefaultMethod() const return false; } - -JSValue ProxyInstance::invokeDefaultMethod(ExecState* exec, const ArgList& args) + +JSValue ProxyInstance::invokeDefaultMethod(ExecState* exec) { - return invoke(exec, InvokeDefault, 0, args); + return invoke(exec, InvokeDefault, 0, ArgList(exec)); } bool ProxyInstance::supportsConstruct() const |