From: Steve Block <steveblock@google.com>
Date: Mon, 12 Oct 2009 10:32:45 +0000 (+0100)
Subject: Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f26944c;p=android-x86%2Fexternal-webkit.git

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 e8ef7bf4e..72ba964f9 100644
--- 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)