diff options
| author | Steve Block <steveblock@google.com> | 2009-10-20 15:57:41 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:14 +0000 |
| commit | 5995cab44737fd5374956941260caf2e2e8290b3 (patch) | |
| tree | 669ae2fcd3c03f2fdf277aa49235efc71466c5f6 | |
| parent | 67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a (diff) | |
| download | external_webkit-5995cab44737fd5374956941260caf2e2e8290b3.zip external_webkit-5995cab44737fd5374956941260caf2e2e8290b3.tar.gz external_webkit-5995cab44737fd5374956941260caf2e2e8290b3.tar.bz2 | |
Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController.
See http://trac.webkit.org/changeset/49372
Change-Id: Iecc49a2185681eb2f37b5ecc9364fa8946493f69
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 541e878..0fc7123 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1136,7 +1136,7 @@ static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj, LOG_ASSERT(pFrame, "stringByEvaluatingJavaScriptFromString must take a valid frame pointer!"); WebCore::ScriptValue value = - pFrame->loader()->executeScript(to_string(env, script), true); + pFrame->script()->executeScript(to_string(env, script), true); WebCore::String result = WebCore::String(); if (!value.getString(result)) return NULL; |