diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-11 11:39:36 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:36:01 -0800 |
| commit | d0dada9ef392026973da2fbb2cb4d9b9504f91f0 (patch) | |
| tree | 21fc315ff8f57ad80fb445dc198afa910574113f | |
| parent | 97349b6656c58e631c13b8552b077870a6a32eba (diff) | |
| download | external_webkit-d0dada9ef392026973da2fbb2cb4d9b9504f91f0.zip external_webkit-d0dada9ef392026973da2fbb2cb4d9b9504f91f0.tar.gz external_webkit-d0dada9ef392026973da2fbb2cb4d9b9504f91f0.tar.bz2 | |
Merge Webkit at r71558: resolve BackForwardList refactor conflict
http://trac.webkit.org/changeset/70960
Change-Id: I9a423e7069bd90a37edfdfcc4bd66fdc55600bcb
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index c060e4c..206c1e7 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -29,6 +29,7 @@ #include "WebHistory.h" #include "BackForwardList.h" +#include "BackForwardListImpl.h" #include "DocumentLoader.h" #include "Frame.h" #include "FrameLoader.h" @@ -80,7 +81,7 @@ static void WebHistoryClose(JNIEnv* env, jobject obj, jint frame) LOG_ASSERT(frame, "Close needs a valid Frame pointer!"); WebCore::Frame* pFrame = (WebCore::Frame*)frame; - WebCore::BackForwardList* list = pFrame->page()->backForwardList(); + WebCore::BackForwardListImpl* list = static_cast<WebCore::BackForwardListImpl*>(pFrame->page()->backForwardList()); RefPtr<WebCore::HistoryItem> current = list->currentItem(); // Remove each item instead of using close(). close() is intended to be used // right before the list is deleted. @@ -148,7 +149,7 @@ static void WebHistoryRestoreIndex(JNIEnv* env, jobject obj, jint frame, jint in WebCore::Frame* pFrame = (WebCore::Frame*)frame; WebCore::Page* page = pFrame->page(); WebCore::HistoryItem* currentItem = - page->backForwardList()->entries()[index].get(); + static_cast<WebCore::BackForwardListImpl*>(page->backForwardList())->entries()[index].get(); // load the current page with FrameLoadTypeIndexedBackForward so that it // will use cache when it is possible |