Reset scroll and scale while toggling "Request desktop site"

third_party/WebKit/Source/web/WebViewImpl.cpp

Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 9c44ea096cfe65ca06e8f72f9ffe4dd8d87782dc..899803fbcab671b616e08614bef61513caf3d97d 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -80,6 +80,7 @@
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
+#include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderStateMachine.h"
@@ -3285,6 +3286,14 @@ void WebViewImpl::ResetScrollAndScaleState() {
       scrollable_area->SetScrollOffset(ScrollOffset(), kProgrammaticScroll);
   }
 
+  if (Document* document =
+          ToLocalFrame(GetPage()->MainFrame())->GetDocument()) {
+    if (DocumentLoader* loader = document->Loader()) {
+      if (HistoryItem* item = loader->GetHistoryItem())
+        item->SetDidSaveScrollOrScaleState(false);
+    }
+  }
+
   GetPageScaleConstraintsSet().SetNeedsReset(true);
 }