[DevTools] Do not reset scroll when emulating device.

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 3dea6bed68ce98ddfd7bdc357299660eb44e5e37..86a8fa07312a22b144d521a4e64402208af31032 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -3491,17 +3491,13 @@ float WebViewImpl::maximumPageScaleFactor() const
     return pageScaleConstraintsSet().finalConstraints().maximumScale;
 }
 
-void WebViewImpl::resetScrollAndScaleState()
-{
-    resetScrollAndScaleState(false);
-}
-
-void WebViewImpl::resetScrollAndScaleStateImmediately()
+void WebViewImpl::resetScaleStateImmediately()
 {
-    resetScrollAndScaleState(true);
+    page()->frameHost().visualViewport().setScale(1);
+    pageScaleConstraintsSet().setNeedsReset(true);
 }
 
-void WebViewImpl::resetScrollAndScaleState(bool immediately)
+void WebViewImpl::resetScrollAndScaleState()
 {
     page()->frameHost().visualViewport().reset();
 
@@ -3516,8 +3512,6 @@ void WebViewImpl::resetScrollAndScaleState(bool immediately)
     }
 
     pageScaleConstraintsSet().setNeedsReset(true);
-    if (immediately)
-        refreshPageScaleFactorAfterLayout();
 }
 
 void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,