Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.

http://trac.webkit.org/changeset/49067

Change-Id: Ie15f56d2fa33f1d535ed5d048f0ac97c9d054271

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index e8ef7bf..72ba964 100644 (file)
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1124,7 +1124,7 @@ static void GoBackOrForward(JNIEnv *env, jobject obj, jint pos)
     else if (pos == -1)
         pFrame->page()->goBack();
     else
-        pFrame->loader()->goBackOrForward(pos);
+        pFrame->page()->goBackOrForward(pos);
 }
 
 static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj, jstring script)