Restore scrolloffset after exiting fullscreen.

android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java

Index: android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java b/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java
index 78160f465ee353c8b268724758e7abb1b732a17d..5cd0a5ffe23520289ce5d896911500a768392aec 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java
@@ -59,10 +59,6 @@ public class AwScrollOffsetManager {
 
     private final Delegate mDelegate;
 
-    // Scroll offset as seen by the native side.
-    private int mNativeScrollX;
-    private int mNativeScrollY;
-
     // How many pixels can we scroll in a given direction.
     private int mMaxHorizontalScrollOffset;
     private int mMaxVerticalScrollOffset;
@@ -150,9 +146,6 @@ public class AwScrollOffsetManager {
 
     // Called by the native side to scroll the container view.
     public void scrollContainerViewTo(int x, int y) {
-        mNativeScrollX = x;
-        mNativeScrollY = y;
-
         final int scrollX = mDelegate.getContainerViewScrollX();
         final int scrollY = mDelegate.getContainerViewScrollY();
         final int deltaX = x - scrollX;
@@ -238,13 +231,8 @@ public class AwScrollOffsetManager {
             return;
         }
 
-        if (x == mNativeScrollX && y == mNativeScrollY) return;
-
-        // The scrollNativeTo call should be a simple store, so it's OK to assume it always
-        // succeeds.
-        mNativeScrollX = x;
-        mNativeScrollY = y;
-
+        // This will be a no-op if the delegate finds out it will scroll to the
+        // same offset in CSS pixel.
         mDelegate.scrollNativeTo(x, y);
     }