From 5995cab44737fd5374956941260caf2e2e8290b3 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 20 Oct 2009 15:57:41 +0100 Subject: [PATCH] Merge webkit.org at r50258 : FrameLoader::executeScript has moved to ScriptController. See http://trac.webkit.org/changeset/49372 Change-Id: Iecc49a2185681eb2f37b5ecc9364fa8946493f69 --- WebKit/android/jni/WebCoreFrameBridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 541e87894..0fc712312 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; -- 2.11.0