| 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));
|
| }
|
|
|
|
|