summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebCoreFrameBridge.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/android/jni/WebCoreFrameBridge.cpp')
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp6
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();