[DevTools] More Device Mode polish.

third_party/WebKit/Source/core/inspector/InspectorOverlayPage.html

Index: third_party/WebKit/Source/core/inspector/InspectorOverlayPage.html
diff --git a/third_party/WebKit/Source/core/inspector/InspectorOverlayPage.html b/third_party/WebKit/Source/core/inspector/InspectorOverlayPage.html
index 3671ee5f9590d70c2baced87fe5a78f826616afb..9b514e97204d5268f756defc03dff7cad2b2e0aa 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorOverlayPage.html
+++ b/third_party/WebKit/Source/core/inspector/InspectorOverlayPage.html
@@ -472,7 +472,9 @@ function _drawGrid(context, rulerAtRight, rulerAtBottom)
 
     context.save();
 
-    var pageFactor = pageZoomFactor;
+    var pageFactor = pageZoomFactor * pageScaleFactor;
+    var scrollX = window.scrollX * pageScaleFactor;
+    var scrollY = window.scrollY * pageScaleFactor;
     function zoom(x)
     {
         return Math.round(x * pageFactor);
@@ -612,6 +614,7 @@ function reset(resetData)
 {
     window.viewportSize = resetData.viewportSize;
     window.deviceScaleFactor = resetData.deviceScaleFactor;
+    window.pageScaleFactor = resetData.pageScaleFactor;
     window.pageZoomFactor = resetData.pageZoomFactor;
     window.scrollX = Math.round(resetData.scrollX);
     window.scrollY = Math.round(resetData.scrollY);