diff options
| author | Steve Block <steveblock@google.com> | 2009-12-09 16:48:47 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:13 +0000 |
| commit | 02f7edff6c1625ed75eaf447e02ef659e62e3a10 (patch) | |
| tree | d8a5c7f9422ecbfae7c72123b9abf470c65fd78b | |
| parent | 81d7a8e20f14dc502cc38f8d654adf1334a2833c (diff) | |
| download | external_webkit-02f7edff6c1625ed75eaf447e02ef659e62e3a10.zip external_webkit-02f7edff6c1625ed75eaf447e02ef659e62e3a10.tar.gz external_webkit-02f7edff6c1625ed75eaf447e02ef659e62e3a10.tar.bz2 | |
Merge webkit.org at r51976 : ScriptValue::getString now takes a ScriptState parameter.
See http://trac.webkit.org/changeset/51801
Change-Id: I819c17c8609dd65799bd8a2245cc454e27271969
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 7d1d24d..46e4b64 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1180,7 +1180,12 @@ static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj, WebCore::ScriptValue value = pFrame->script()->executeScript(to_string(env, script), true); WebCore::String result = WebCore::String(); - if (!value.getString(result)) +#if USE(JSC) + ScriptState* scriptState = pFrame->script()->globalObject(mainThreadNormalWorld())->globalExec(); +#elif USE(V8) + ScriptState* scriptState = pFrame->script()->mainWorldScriptState(); +#endif + if (!value.getString(scriptState, result)) return NULL; unsigned len = result.length(); if (len == 0) |