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

Unified Diff: Source/web/InspectorOverlayImpl.cpp

Issue 1025543002: Remove old pinch-zoom paths from Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 5 years, 9 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 | « Source/web/InspectorEmulationAgent.cpp ('k') | Source/web/PopupMenuTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/InspectorOverlayImpl.cpp
diff --git a/Source/web/InspectorOverlayImpl.cpp b/Source/web/InspectorOverlayImpl.cpp
index 6961378c91c05cd17f47f51808316e6cc47ad5f0..0c8c61f4b5ba0bfcc6f61ad660469be32d9ef6ec 100644
--- a/Source/web/InspectorOverlayImpl.cpp
+++ b/Source/web/InspectorOverlayImpl.cpp
@@ -372,7 +372,9 @@ LocalFrame* InspectorOverlayImpl::overlayMainFrame()
void InspectorOverlayImpl::reset(const IntSize& viewportSize, int scrollX, int scrollY)
{
RefPtr<JSONObject> resetData = JSONObject::create();
- resetData->setNumber("pageScaleFactor", m_webViewImpl->page()->settings().pinchVirtualViewportEnabled() ? 1 : m_webViewImpl->page()->pageScaleFactor());
+ // TODO(bokan): |pageScaleFactor| was previously used to scale from CSS values but is unnecessary
+ // now that virtual-viewport is enabled. This can probably be removed.
+ resetData->setNumber("pageScaleFactor", 1);
resetData->setNumber("deviceScaleFactor", m_webViewImpl->page()->deviceScaleFactor());
resetData->setObject("viewportSize", buildObjectForSize(viewportSize));
resetData->setNumber("pageZoomFactor", m_webViewImpl->mainFrameImpl()->frame()->pageZoomFactor());
« no previous file with comments | « Source/web/InspectorEmulationAgent.cpp ('k') | Source/web/PopupMenuTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698