Merge "Persist scrollPoint as part of the history item." into honeycomb

1 files changed, 7 insertions, 0 deletions

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 80de32f..27ced0e 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1152,6 +1152,13 @@ void WebViewCore::setScrollOffset(int moveGeneration, int userScrolled, int dx,
             m_mainFrame->eventHandler()->sendScrollEvent();
         }
 
+        // Update history item to reflect the new scroll position.
+        // This also helps save the history information when the browser goes to
+        // background, so scroll position will be restored if browser gets
+        // killed while in background.
+        WebCore::HistoryController* history = m_mainFrame->loader()->history();
+        history->saveScrollPositionAndViewStateToItem(history->currentItem());
+
         // update the currently visible screen
         sendPluginVisibleScreen();
     }