Source/web/InspectorClientImpl.cpp - Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fixed layout test breakage 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..55e9f8f57294fb29d75c102eed35030f133ca820 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->setPageScaleFactor(scale);

+ m_inspectedWebView->setMainFrameScrollOffset(origin);

}

void InspectorClientImpl::getAllocatedObjects(HashSet<const void*>& set)

« no previous file with comments | « Source/web/FullscreenController.cpp ('k') | Source/web/WebInputEventConversion.cpp » ('j') | no next file with comments »