summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-12 11:32:45 +0100
committerSteve Block <steveblock@google.com>2009-10-20 00:45:06 +0100
commit5f26944ca7d695d502778deeef7b20565bc3fa2e (patch)
tree9754f28e92d2e80097ed96cd99b9ff3294555197
parent059ea0497a87479c013371fb9f866f9f2677b529 (diff)
downloadexternal_webkit-5f26944ca7d695d502778deeef7b20565bc3fa2e.zip
external_webkit-5f26944ca7d695d502778deeef7b20565bc3fa2e.tar.gz
external_webkit-5f26944ca7d695d502778deeef7b20565bc3fa2e.tar.bz2
Merge webkit.org at R49305 : goBackOrForwards is now a member of Page.
http://trac.webkit.org/changeset/49067 Change-Id: Ie15f56d2fa33f1d535ed5d048f0ac97c9d054271
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index e8ef7bf..72ba964 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)