summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/runtime_method.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bridge/runtime_method.cpp')
-rw-r--r--WebCore/bridge/runtime_method.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/bridge/runtime_method.cpp b/WebCore/bridge/runtime_method.cpp
index 391129e..15e029c 100644
--- a/WebCore/bridge/runtime_method.cpp
+++ b/WebCore/bridge/runtime_method.cpp
@@ -87,12 +87,12 @@ bool RuntimeMethod::getOwnPropertyDescriptor(ExecState* exec, const Identifier&
return InternalFunction::getOwnPropertyDescriptor(exec, propertyName, descriptor);
}
-static JSValue JSC_HOST_CALL callRuntimeMethod(ExecState* exec)
+static EncodedJSValue JSC_HOST_CALL callRuntimeMethod(ExecState* exec)
{
RuntimeMethod* method = static_cast<RuntimeMethod*>(exec->callee());
if (method->methods()->isEmpty())
- return jsUndefined();
+ return JSValue::encode(jsUndefined());
RefPtr<Instance> instance;
@@ -101,7 +101,7 @@ static JSValue JSC_HOST_CALL callRuntimeMethod(ExecState* exec)
RuntimeObject* runtimeObject = static_cast<RuntimeObject*>(asObject(thisValue));
instance = runtimeObject->getInternalInstance();
if (!instance)
- return RuntimeObject::throwInvalidAccessError(exec);
+ return JSValue::encode(RuntimeObject::throwInvalidAccessError(exec));
} else {
// Calling a runtime object of a plugin element?
if (thisValue.inherits(&JSHTMLElement::s_info)) {
@@ -109,14 +109,14 @@ static JSValue JSC_HOST_CALL callRuntimeMethod(ExecState* exec)
instance = pluginInstance(element);
}
if (!instance)
- return throwError(exec, TypeError);
+ return throwVMTypeError(exec);
}
ASSERT(instance);
instance->begin();
JSValue result = instance->invokeMethod(exec, method);
instance->end();
- return result;
+ return JSValue::encode(result);
}
CallType RuntimeMethod::getCallData(CallData& callData)