third_party/WebKit/Source/web/WebViewImpl.cpp - Issue 1422513006: Simplify TouchAction enum to be a simple bit flag

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: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1422513006: Simplify TouchAction enum to be a simple bit flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix computed style / layout tests and CR feedback Created 5 years, 2 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:

Index: third_party/WebKit/Source/web/WebViewImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp

index 2ff804ebb0cef02fe89bcd33c78e41db630d25b3..a3da50e124ea7cb0b24d896ad3240194b60f76d5 100644

--- a/third_party/WebKit/Source/web/WebViewImpl.cpp

+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp

@@ -2845,7 +2845,7 @@ bool WebViewImpl::scrollFocusedNodeIntoRect(const WebRect& rectInViewport)

// zoom in if the user won't be able to zoom out. e.g if the textbox is within a

// touch-action: none container the user can't zoom back out.

TouchAction action = TouchActionUtil::computeEffectiveTouchAction(*element);

- if (action != TouchActionAuto && !(action & TouchActionPinchZoom))

+ if (!(action & TouchActionPinchZoom))

zoomInToLegibleScale = false;

}