Restore user state on ReloadwithoutSubResourceCacheRevalidation

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 0eb7138c45286ea4e9666d26bf2644b00a2aa9fc..6f21d56f6997cd27b46b5101326c1b9ff206b619 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -122,11 +122,8 @@ bool isReloadLoadType(FrameLoadType type)
 
 static bool needsHistoryItemRestore(FrameLoadType type)
 {
-    // TODO(toyoshim): Check if this should return true for
-    // FrameLoadTypeReloadMainResource.
-    return type == FrameLoadTypeBackForward
-        || type == FrameLoadTypeReload
-        || type == FrameLoadTypeReloadBypassingCache;
+    // TODO(toyoshim): Shall we return true for FrameLoadTypeInitialHistoryLoad too?
+    return type == FrameLoadTypeBackForward || isReloadLoadType(type);
 }
 
 // static
@@ -1200,7 +1197,7 @@ void FrameLoader::restoreScrollPositionAndViewState()
         return;
 
     bool shouldRestoreScroll = m_currentItem->scrollRestorationType() != ScrollRestorationManual;
-    bool shouldRestoreScale = m_currentItem->pageScaleFactor();
+    bool shouldRestoreScale = m_currentItem->pageScaleFactor() && !(m_frame->page()->settings().loadWithOverviewMode() && isReloadLoadType(m_loadType));

[Takashi Toyoshima, 2016/08/29 06:42:04]

In terms of UI design policy to handle scroll position and scale, this is a
wrong fix.

To achieve the project goal to remove minor reload variants, we may want to just
restore the scale here even for overview mode, and to modify failed WebView
test.

 
     // This tries to balance:
     //   1. restoring as soon as possible