third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 2126323002: Add support for touch-action: pinch-zoom.

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 2126323002: Add support for touch-action: pinch-zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Check in scroll begin for pointer count and add test Created 4 years, 3 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

« third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-pinch_zoom_touch.html ('K') | « third_party/WebKit/Source/core/css/CSSValueKeywords.in ('k') | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.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 23d3b172a14fb8cf40de6a0d323e4f1704f79f85..f54a05166b9a0e7d3a6393d83c60241ade78b119 100644

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

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

@@ -957,14 +957,17 @@ static CSSValue* touchActionFlagsToCSSValue(TouchAction touchAction)

list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanLeft));

else if (touchAction & TouchActionPanRight)

list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanRight));

if ((touchAction & TouchActionPanY) == TouchActionPanY)

list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanY));

else if (touchAction & TouchActionPanUp)

list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanUp));

else if (touchAction & TouchActionPanDown)

list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanDown));

+ if ((touchAction & TouchActionPinchZoom) == TouchActionPinchZoom)

+ list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePinchZoom));

}

ASSERT(list->length());

return list;

}