third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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/core/css/ComputedStyleCSSValueMapping.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h ('k') | third_party/WebKit/Source/core/input/TouchActionUtil.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

index 7fd5c90f217cd8b59c2f7d03391b9ef193472bd8..af0cb90957a55164eff9dd9ce30619b53b2e819f 100644

--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

@@ -712,13 +712,11 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForTextDecorationStyle(TextDecorati

static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction touchAction)

{

RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();

- if (touchAction == TouchActionAuto)

+ if (touchAction == TouchActionAuto) {

list->append(cssValuePool().createIdentifierValue(CSSValueAuto));

- if (touchAction & TouchActionNone) {

- ASSERT(touchAction == TouchActionNone);

+ } else if (touchAction == TouchActionNone) {

list->append(cssValuePool().createIdentifierValue(CSSValueNone));

- }

- if (touchAction == (TouchActionPanX | TouchActionPanY | TouchActionPinchZoom)) {

+ } else if (touchAction == TouchActionManipulation) {

list->append(cssValuePool().createIdentifierValue(CSSValueManipulation));

} else {

if ((touchAction & TouchActionPanX) == TouchActionPanX)