[UseZoomForDSF:DevTools] Apply the zoom factor equivalent to device scale factor to overlay frame.

third_party/WebKit/Source/web/InspectorOverlay.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 367 matching lines @@
 }
 
 void InspectorOverlay::rebuildOverlayPage()
 {
     FrameView* view = m_webViewImpl->mainFrameImpl()->frameView();
     if (!view)
         return;
 
     IntRect visibleRectInDocument = view->getScrollableArea()->visibleContentRect();
     IntSize viewportSize = m_webViewImpl->page()->frameHost().visualViewport().size();
-    toLocalFrame(overlayPage()->mainFrame())->view()->resize(viewportSize);
+    LocalFrame* frame = toLocalFrame(overlayPage()->mainFrame());
+    frame->view()->resize(viewportSize);
     overlayPage()->frameHost().visualViewport().setSize(viewportSize);
+    float windowToViewportScale = m_webViewImpl->chromeClient().windowToViewportScalar(1.0f);
+    frame->setPageZoomFactor(windowToViewportScale);
+
     reset(viewportSize, visibleRectInDocument.location());
 
     drawNodeHighlight();
     drawQuadHighlight();
     drawPausedInDebuggerMessage();
     drawViewSize();
     if (m_layoutEditor && !m_highlightNode)
         m_layoutEditor->rebuild();
 }
 
@@ skipping 125 matching lines @@
 LocalFrame* InspectorOverlay::overlayMainFrame()
 {
     return toLocalFrame(overlayPage()->mainFrame());
 }
 
 void InspectorOverlay::reset(const IntSize& viewportSize, const IntPoint& documentScrollOffset)
 {
     std::unique_ptr<protocol::DictionaryValue> resetData = protocol::DictionaryValue::create();
     resetData->setNumber("deviceScaleFactor", m_webViewImpl->page()->deviceScaleFactor());
     resetData->setNumber("pageScaleFactor", m_webViewImpl->page()->pageScaleFactor());
-    resetData->setObject("viewportSize", buildObjectForSize(viewportSize));
-    resetData->setNumber("pageZoomFactor", m_webViewImpl->mainFrameImpl()->frame()->pageZoomFactor());
+
+    IntRect viewportInScreen = m_webViewImpl->chromeClient().viewportToScreen(
+        IntRect(IntPoint(), viewportSize), m_webViewImpl->mainFrameImpl()->frame()->view());
+    resetData->setObject("viewportSize", buildObjectForSize(viewportInScreen.size()));
+
+    // The zoom factor in the overlay frame already has been multiplied by the window to viewport scale
+    // (aka device scale factor), so cancel it.
+    float windowToViewportScale = m_webViewImpl->chromeClient().windowToViewportScalar(1.0f);
+    resetData->setNumber("pageZoomFactor", m_webViewImpl->mainFrameImpl()->frame()->pageZoomFactor() / windowToViewportScale);
+
     resetData->setNumber("scrollX", documentScrollOffset.x());
     resetData->setNumber("scrollY", documentScrollOffset.y());
     evaluateInOverlay("reset", std::move(resetData));
 }
 
 void InspectorOverlay::evaluateInOverlay(const String& method, const String& argument)
 {
     ScriptForbiddenScope::AllowUserAgentScript allowScript;
     std::unique_ptr<protocol::ListValue> command = protocol::ListValue::create();
     command->pushValue(protocol::StringValue::create(method));
@@ skipping 230 matching lines @@
 
 void InspectorOverlay::initializeLayoutEditorIfNeeded(Node* node)
 {
     if (m_inspectMode != InspectorDOMAgent::ShowLayoutEditor || !node || !node->isElementNode() || !node->ownerDocument()->isActive() || !m_cssAgent || !m_domAgent)
         return;
     m_layoutEditor = LayoutEditor::create(toElement(node), m_cssAgent, m_domAgent, &overlayMainFrame()->script());
     toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridden(true);
 }
 
 } // namespace blink