Source/core/frame/FrameView.cpp - Issue 731413002: Adjust DOMWindow properties to emulate old style pinch semantics

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/core/frame/FrameView.cpp

Issue 731413002: Adjust DOMWindow properties to emulate old style pinch semantics (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Changes from feedback Created 6 years, 1 month 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

« LayoutTests/fast/dom/Window/window-scaled-viewport-properties.html ('K') | « LayoutTests/fast/dom/Window/window-scaled-viewport-properties-expected.txt ('k') | Source/core/frame/LocalDOMWindow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/frame/FrameView.cpp

diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp

index e1f311ef047005484a35ee566f14f782177f2377..78e0461798c473759a7c1d0349f0010965634706 100644

--- a/Source/core/frame/FrameView.cpp

+++ b/Source/core/frame/FrameView.cpp

@@ -1531,6 +1531,7 @@ void FrameView::scrollElementToRect(Element* element, const IntRect& rect)

bool pinchVirtualViewportEnabled = m_frame->settings()->pinchVirtualViewportEnabled();

+ // FIXME: This needs an isMainFrame() check as well. crbug.com/378776.

if (pinchVirtualViewportEnabled) {

PinchViewport& pinchViewport = m_frame->page()->frameHost().pinchViewport();