Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index bb0515186be9cc2c93ac91a3eeab92b56c4b33fc..959c6aa155ba1c90ab559acfbaf8704874340a40 100644 |
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
@@ -1463,11 +1463,14 @@ static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t |
ASSERT(touchAction == TouchActionNone); |
list->append(cssValuePool().createIdentifierValue(CSSValueNone)); |
} |
- if (touchAction & TouchActionPanX) |
- list->append(cssValuePool().createIdentifierValue(CSSValuePanX)); |
- if (touchAction & TouchActionPanY) |
- list->append(cssValuePool().createIdentifierValue(CSSValuePanY)); |
- |
+ if (touchAction == (TouchActionPanX | TouchActionPanY | TouchActionPinchZoom)) { |
+ list->append(cssValuePool().createIdentifierValue(CSSValueManipulation)); |
+ } else { |
+ if (touchAction & TouchActionPanX) |
+ list->append(cssValuePool().createIdentifierValue(CSSValuePanX)); |
+ if (touchAction & TouchActionPanY) |
+ list->append(cssValuePool().createIdentifierValue(CSSValuePanY)); |
+ } |
ASSERT(list->length()); |
return list.release(); |
} |