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

Unified Diff: Source/web/InspectorClientImpl.cpp

Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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: Source/web/InspectorClientImpl.cpp
diff --git a/Source/web/InspectorClientImpl.cpp b/Source/web/InspectorClientImpl.cpp
index 42521e37adb6af95f1c4bee881a0e5a87751f2bf..d65ded80e0fe2d6f444ab1c33e1f0d431119caa0 100644
--- a/Source/web/InspectorClientImpl.cpp
+++ b/Source/web/InspectorClientImpl.cpp
@@ -36,8 +36,9 @@
#include "WebViewImpl.h"
#include "core/inspector/InspectorInstrumentation.h"
#include "core/frame/DOMWindow.h"
-#include "core/page/Page.h"
+#include "core/frame/LocalFrame.h"
#include "core/frame/Settings.h"
+#include "core/page/Page.h"
#include "platform/JSONValues.h"
#include "platform/geometry/FloatRect.h"
#include "public/platform/WebRect.h"
@@ -139,7 +140,8 @@ void InspectorClientImpl::setShowScrollBottleneckRects(bool show)
void InspectorClientImpl::requestPageScaleFactor(float scale, const IntPoint& origin)
{
- m_inspectedWebView->setPageScaleFactor(scale, origin);
+ m_inspectedWebView->setPinchViewportScaleFactor(scale);
+ m_inspectedWebView->setMainFrameScrollOffset(origin);
}
void InspectorClientImpl::getAllocatedObjects(HashSet<const void*>& set)

Powered by Google App Engine
This is Rietveld 408576698