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

Unified Diff: third_party/WebKit/Source/web/InspectorOverlay.cpp

Issue 2151083002: DevTools: explicitly differentiate ints vs doubles in the protocol bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lcean Created 4 years, 5 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
« no previous file with comments | « third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/InspectorOverlay.cpp
diff --git a/third_party/WebKit/Source/web/InspectorOverlay.cpp b/third_party/WebKit/Source/web/InspectorOverlay.cpp
index 955e043fb16cd10a261382f3afe1a43859d59b39..c92134bb80c8dd0daa8c0e93c32490fe478eea09 100644
--- a/third_party/WebKit/Source/web/InspectorOverlay.cpp
+++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp
@@ -404,8 +404,8 @@ void InspectorOverlay::rebuildOverlayPage()
static std::unique_ptr<protocol::DictionaryValue> buildObjectForSize(const IntSize& size)
{
std::unique_ptr<protocol::DictionaryValue> result = protocol::DictionaryValue::create();
- result->setNumber("width", size.width());
- result->setNumber("height", size.height());
+ result->setInteger("width", size.width());
+ result->setInteger("height", size.height());
return result;
}
@@ -539,8 +539,8 @@ LocalFrame* InspectorOverlay::overlayMainFrame()
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->setDouble("deviceScaleFactor", m_webViewImpl->page()->deviceScaleFactor());
+ resetData->setDouble("pageScaleFactor", m_webViewImpl->page()->pageScaleFactor());
IntRect viewportInScreen = m_webViewImpl->chromeClient().viewportToScreen(
IntRect(IntPoint(), viewportSize), m_webViewImpl->mainFrameImpl()->frame()->view());
@@ -548,10 +548,10 @@ void InspectorOverlay::reset(const IntSize& viewportSize, const IntPoint& docume
// The zoom factor in the overlay frame already has been multiplied by the window to viewport scale
// (aka device scale factor), so cancel it.
- resetData->setNumber("pageZoomFactor", m_webViewImpl->mainFrameImpl()->frame()->pageZoomFactor() / windowToViewportScale());
+ resetData->setDouble("pageZoomFactor", m_webViewImpl->mainFrameImpl()->frame()->pageZoomFactor() / windowToViewportScale());
- resetData->setNumber("scrollX", documentScrollOffset.x());
- resetData->setNumber("scrollY", documentScrollOffset.y());
+ resetData->setInteger("scrollX", documentScrollOffset.x());
+ resetData->setInteger("scrollY", documentScrollOffset.y());
evaluateInOverlay("reset", std::move(resetData));
}
« no previous file with comments | « third_party/WebKit/Source/platform/v8_inspector/V8StringUtil.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698