Restore user state on ReloadwithoutSubResourceCacheRevalidation

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 104 matching lines @@
 
 bool isReloadLoadType(FrameLoadType type)
 {
     return type == FrameLoadTypeReload
         || type == FrameLoadTypeReloadMainResource
         || type == FrameLoadTypeReloadBypassingCache;
 }
 
 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
 ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item, WebCachePolicy cachePolicy)
 {
     RefPtr<EncodedFormData> formData = item->formData();
     ResourceRequest request(item->url());
     request.setHTTPReferrer(item->referrer());
     request.setCachePolicy(cachePolicy);
     if (formData) {
@@ skipping 1053 matching lines @@
         || !m_currentItem
         || !m_stateMachine.committedFirstRealDocumentLoad()
         || !documentLoader()) {
         return;
     }
 
     if (!needsHistoryItemRestore(m_loadType))
         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
     //   2. not overriding user scroll (TODO(majidvp): also respect user scale)
     //   3. detecting clamping to avoid repeatedly popping the scroll position
     //      down as the page height increases
     //   4. ignore clamp detection if we are not restoring scroll or after load
     //      completes because that may be because the page will never reach its
     //      previous height
     bool canRestoreWithoutClamping = view->layoutViewportScrollableArea()->clampScrollPosition(m_currentItem->scrollPoint()) == m_currentItem->scrollPoint();
@@ skipping 405 matching lines @@
     tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoader->url() : String());
     return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const
 {
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTracedValue());
 }
 
 } // namespace blink