| Index: Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| index 164782ced0c591e766a7a262278a5a72aa205d4e..4a2d5d1edc25064a330ea9a71c38bd9b3201bac4 100644
|
| --- a/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| +++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| @@ -715,10 +715,19 @@ static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t
|
| if (touchAction == (TouchActionPanX | TouchActionPanY | TouchActionPinchZoom)) {
|
| list->append(cssValuePool().createIdentifierValue(CSSValueManipulation));
|
| } else {
|
| - if (touchAction & TouchActionPanX)
|
| + if ((touchAction & TouchActionPanX) == TouchActionPanX)
|
| list->append(cssValuePool().createIdentifierValue(CSSValuePanX));
|
| - if (touchAction & TouchActionPanY)
|
| + else if (touchAction & TouchActionPanLeft)
|
| + list->append(cssValuePool().createIdentifierValue(CSSValuePanLeft));
|
| + else if (touchAction & TouchActionPanRight)
|
| + list->append(cssValuePool().createIdentifierValue(CSSValuePanRight));
|
| +
|
| + if ((touchAction & TouchActionPanY) == TouchActionPanY)
|
| list->append(cssValuePool().createIdentifierValue(CSSValuePanY));
|
| + else if (touchAction & TouchActionPanUp)
|
| + list->append(cssValuePool().createIdentifierValue(CSSValuePanUp));
|
| + else if (touchAction & TouchActionPanDown)
|
| + list->append(cssValuePool().createIdentifierValue(CSSValuePanDown));
|
| }
|
| ASSERT(list->length());
|
| return list.release();
|
|
|