Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 134153016: add 'manipulation' support to CSS touch-action parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 12179899c4d5ed218ec3718d3c6c781f14a28f8b..eafceed820d241ee5506c81950ea64d4896e4bb8 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -1439,11 +1439,12 @@ static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t
ASSERT(touchAction == TouchActionNone);
list->append(cssValuePool().createIdentifierValue(CSSValueNone));
}
- if (touchAction & TouchActionPanX)
+ if (!(touchAction & TouchActionZoom) && (touchAction & TouchActionPanX))
list->append(cssValuePool().createIdentifierValue(CSSValuePanX));
- if (touchAction & TouchActionPanY)
+ if (!(touchAction & TouchActionZoom) && (touchAction & TouchActionPanY))
list->append(cssValuePool().createIdentifierValue(CSSValuePanY));
-
+ if (touchAction & TouchActionZoom)
Rick Byers 2014/03/05 14:41:13 This code should ASSERT on invalid combinations li
gnana 2014/03/06 08:11:14 Done.
+ list->append(cssValuePool().createIdentifierValue(CSSValueManipulation));
ASSERT(list->length());
return list.release();
}

Powered by Google App Engine
This is Rietveld 408576698