From c2b81cdbb474946907dbf44328a37c8882112f77 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:46:44 +0000 Subject: [PATCH] Merge webkit.org at r54127 : mainWorldScriptState is now a global function. See http://trac.webkit.org/changeset/54051 Change-Id: I1f904a812dab1acf3eafd4c287571df245d4fa0d --- WebKit/android/jni/WebCoreFrameBridge.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index a89e6964f..7a998e06d 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(); -- 2.11.0