summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 18:28:38 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 18:28:38 +0000
commitacbada78f9fccb36165b3669bc0fc1ca14427554 (patch)
treef06e25da1ddd4812f62f0ea56590560c8e4f0321 /webkit/port
parent12117f3379caccd1e75cbee72f94667073b14d18 (diff)
downloadchromium_src-acbada78f9fccb36165b3669bc0fc1ca14427554.zip
chromium_src-acbada78f9fccb36165b3669bc0fc1ca14427554.tar.gz
chromium_src-acbada78f9fccb36165b3669bc0fc1ca14427554.tar.bz2
Fix build break to worker feature after webkit merge. We also need to fix v8 version of ScriptValue in WebKit.
Review URL: http://codereview.chromium.org/43062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/bindings/v8/WorkerScriptController.cpp12
-rw-r--r--webkit/port/bindings/v8/WorkerScriptController.h3
2 files changed, 15 insertions, 0 deletions
diff --git a/webkit/port/bindings/v8/WorkerScriptController.cpp b/webkit/port/bindings/v8/WorkerScriptController.cpp
index 9d73437..d0e03bf 100644
--- a/webkit/port/bindings/v8/WorkerScriptController.cpp
+++ b/webkit/port/bindings/v8/WorkerScriptController.cpp
@@ -73,6 +73,12 @@ ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode)
return ScriptValue();
}
+ScriptValue WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, ScriptValue* exception)
+{
+ // FIXME(jianli): to be implemented.
+ return evaluate(sourceCode);
+}
+
void WorkerScriptController::forbidExecution()
{
// This function is called from another thread.
@@ -80,6 +86,12 @@ void WorkerScriptController::forbidExecution()
m_executionForbidden = true;
}
+void WorkerScriptController::setException(ScriptValue exception)
+{
+ // FIXME(jianli): to be implemented.
+ notImplemented();
+}
+
} // namespace WebCore
#endif // ENABLE(WORKERS)
diff --git a/webkit/port/bindings/v8/WorkerScriptController.h b/webkit/port/bindings/v8/WorkerScriptController.h
index 73cf799..703afd5 100644
--- a/webkit/port/bindings/v8/WorkerScriptController.h
+++ b/webkit/port/bindings/v8/WorkerScriptController.h
@@ -48,6 +48,9 @@ namespace WebCore {
WorkerContextExecutionProxy* proxy() { return m_proxy.get(); }
ScriptValue evaluate(const ScriptSourceCode&);
+ ScriptValue evaluate(const ScriptSourceCode&, ScriptValue* exception);
+
+ void setException(ScriptValue);
void forbidExecution();