| Index: Source/core/css/CSSPrimitiveValueMappings.h
|
| diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
|
| index 53cbbc8fb01f7a42d05f8e2aaab4dcd037f57b62..42e25438adef0d25ff0f235804846d2f8b998401 100644
|
| --- a/Source/core/css/CSSPrimitiveValueMappings.h
|
| +++ b/Source/core/css/CSSPrimitiveValueMappings.h
|
| @@ -4465,33 +4465,23 @@ template<> inline CSSPrimitiveValue::operator EIsolation() const
|
| return IsolationAuto;
|
| }
|
|
|
| -template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TouchActionDelay t)
|
| - : CSSValue(PrimitiveClass)
|
| -{
|
| - m_primitiveUnitType = CSS_VALUE_ID;
|
| - switch (t) {
|
| - case TouchActionDelayNone:
|
| - m_value.valueID = CSSValueNone;
|
| - break;
|
| - case TouchActionDelayScript:
|
| - m_value.valueID = CSSValueScript;
|
| - break;
|
| - }
|
| -}
|
| -
|
| -template<> inline CSSPrimitiveValue::operator TouchActionDelay() const
|
| +template<> inline CSSPrimitiveValue::operator ScrollBlocksOn() const
|
| {
|
| switch (m_value.valueID) {
|
| case CSSValueNone:
|
| - return TouchActionDelayNone;
|
| - case CSSValueScript:
|
| - return TouchActionDelayScript;
|
| + return ScrollBlocksOnNone;
|
| + case CSSValueStartTouch:
|
| + return ScrollBlocksOnStartTouch;
|
| + case CSSValueWheelEvent:
|
| + return ScrollBlocksOnWheelEvent;
|
| + case CSSValueScrollEvent:
|
| + return ScrollBlocksOnScrollEvent;
|
| default:
|
| break;
|
| }
|
|
|
| ASSERT_NOT_REACHED();
|
| - return TouchActionDelayNone;
|
| + return ScrollBlocksOnNone;
|
| }
|
|
|
| template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSBoxType cssBox)
|
|
|