diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-05 08:18:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-05 08:18:06 -0800 |
| commit | 0d72f882dbb757a8398e371417dd96714d0dc7f7 (patch) | |
| tree | 5116525cd89d44e32dd6986ed17cdec8439fc354 /WebKit/android/jni/WebHistory.cpp | |
| parent | 48a3f99ea45a02bbd9cea50e6d5ed3795e428fe0 (diff) | |
| parent | fa1ac15a8417461f160824c688d94b80150f799e (diff) | |
| download | external_webkit-0d72f882dbb757a8398e371417dd96714d0dc7f7.zip external_webkit-0d72f882dbb757a8398e371417dd96714d0dc7f7.tar.gz external_webkit-0d72f882dbb757a8398e371417dd96714d0dc7f7.tar.bz2 | |
Merge "Fix history restore."
Diffstat (limited to 'WebKit/android/jni/WebHistory.cpp')
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index ad7b32e..46c40a5 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -147,15 +147,8 @@ static void WebHistoryRestoreIndex(JNIEnv* env, jobject obj, jint frame, jint in LOG_ASSERT(frame, "RestoreState needs a valid Frame pointer!"); WebCore::Frame* pFrame = (WebCore::Frame*)frame; WebCore::Page* page = pFrame->page(); - - // Set the current index in the list. - WebCore::BackForwardList* list = page->backForwardList(); - WebCore::HistoryItem* currentItem = list->entries()[index].get(); - list->goToItem(currentItem); - - // Update the current and previous history item. - WebCore::FrameLoader* loader = pFrame->loader(); - loader->history()->setCurrentItem(currentItem); + WebCore::HistoryItem* currentItem = + page->backForwardList()->entries()[index].get(); // load the current page with FrameLoadTypeIndexedBackForward so that it // will use cache when it is possible |