Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(601)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp

Issue 2108803006: Fix inspector overlay when use-zoom-for-dsf is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unnecessary include Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp b/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
index 09c2e5836bcb30d8d2d2abba45db0a6eeb168518..06c55d4e01060437dacc16b25c02efe363d8ca38 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
@@ -218,6 +218,7 @@ InspectorHighlight::InspectorHighlight()
, m_showRulers(false)
, m_showExtensionLines(false)
, m_displayAsMaterial(false)
+ , m_windowToViewportScale(1.0f)
{
}
@@ -229,11 +230,12 @@ InspectorHighlightConfig::InspectorHighlightConfig()
{
}
-InspectorHighlight::InspectorHighlight(Node* node, const InspectorHighlightConfig& highlightConfig, bool appendElementInfo)
+InspectorHighlight::InspectorHighlight(Node* node, const InspectorHighlightConfig& highlightConfig, bool appendElementInfo, float windowToViewportScale)
: m_highlightPaths(protocol::ListValue::create())
, m_showRulers(highlightConfig.showRulers)
, m_showExtensionLines(highlightConfig.showExtensionLines)
, m_displayAsMaterial(highlightConfig.displayAsMaterial)
+ , m_windowToViewportScale(windowToViewportScale)
{
appendPathsForShapeOutside(node, highlightConfig);
appendNodeHighlight(node, highlightConfig);
@@ -330,6 +332,7 @@ std::unique_ptr<protocol::DictionaryValue> InspectorHighlight::asProtocolValue()
if (m_elementInfo)
object->setValue("elementInfo", m_elementInfo->clone());
object->setBoolean("displayAsMaterial", m_displayAsMaterial);
+ object->setNumber("windowToViewportScale", m_windowToViewportScale);
return object;
}

Powered by Google App Engine
This is Rietveld 408576698