From 67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 20 Oct 2009 15:07:10 +0100 Subject: Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader. See http://trac.webkit.org/changeset/49413 Change-Id: I1e584a6a50e1a20e40c76471651c0561df496c47 --- WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebKit/android/WebCoreSupport') diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 182b99f..1e6b9dd 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -755,7 +755,7 @@ void FrameLoaderClientAndroid::saveViewStateToItem(HistoryItem* item) { void FrameLoaderClientAndroid::restoreViewState() { #ifdef ANDROID_HISTORY_CLIENT WebViewCore* webViewCore = WebViewCore::getWebViewCore(m_frame->view()); - HistoryItem* item = m_frame->loader()->currentHistoryItem(); + HistoryItem* item = m_frame->loader()->history()->currentItem(); // restore the scale (only) for the top frame if (!m_frame->tree()->parent()) { int scale = item->bridge()->scale(); -- cgit v1.1