diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:46:44 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 22:46:59 +0000 |
| commit | c2b81cdbb474946907dbf44328a37c8882112f77 (patch) | |
| tree | f2c63a1e3ca8eeec0ea81fac5a5249c6ddf2a5e9 | |
| parent | 9c4df4389f9d998ce8b59b1665a018b69a2eb865 (diff) | |
| download | external_webkit-c2b81cdbb474946907dbf44328a37c8882112f77.zip external_webkit-c2b81cdbb474946907dbf44328a37c8882112f77.tar.gz external_webkit-c2b81cdbb474946907dbf44328a37c8882112f77.tar.bz2 | |
Merge webkit.org at r54127 : mainWorldScriptState is now a global function.
See http://trac.webkit.org/changeset/54051
Change-Id: I1f904a812dab1acf3eafd4c287571df245d4fa0d
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index a89e696..7a998e0 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1168,11 +1168,7 @@ static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj, WebCore::ScriptValue value = pFrame->script()->executeScript(to_string(env, script), true); WebCore::String result = WebCore::String(); -#if USE(JSC) - ScriptState* scriptState = pFrame->script()->globalObject(mainThreadNormalWorld())->globalExec(); -#elif USE(V8) - ScriptState* scriptState = pFrame->script()->mainWorldScriptState(); -#endif + ScriptState* scriptState = mainWorldScriptState(pFrame); if (!value.getString(scriptState, result)) return NULL; unsigned len = result.length(); |