diff options
| author | Steve Block <steveblock@google.com> | 2009-10-20 15:07:10 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:14 +0000 |
| commit | 67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a (patch) | |
| tree | 2c2be1367789b783b450d6a5895ca3d261d22040 /WebKit/android/WebCoreSupport | |
| parent | 5fa903cc3950d366e347a4495de32a0a397b1d47 (diff) | |
| download | external_webkit-67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a.zip external_webkit-67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a.tar.gz external_webkit-67ed0edeb2ad5bb22ec778472b78d41e7eb3b68a.tar.bz2 | |
Merge webkit.org at r50258 : HistoryController has been factored out of FrameLoader.
See http://trac.webkit.org/changeset/49413
Change-Id: I1e584a6a50e1a20e40c76471651c0561df496c47
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |