Unify TouchAction classes

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

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1163 matching lines @@
     list->Append(*CSSIdentifierValue::Create(CSSValueObjects));
   if (text_decoration_skip & kTextDecorationSkipInk)
     list->Append(*CSSIdentifierValue::Create(CSSValueInk));
 
   DCHECK(list->length());
   return list;
 }
 
 static CSSValue* TouchActionFlagsToCSSValue(TouchAction touch_action) {
   CSSValueList* list = CSSValueList::CreateSpaceSeparated();
-  if (touch_action == kTouchActionAuto) {
+  if (touch_action == TouchAction::kTouchActionAuto) {
     list->Append(*CSSIdentifierValue::Create(CSSValueAuto));
-  } else if (touch_action == kTouchActionNone) {
+  } else if (touch_action == TouchAction::kTouchActionNone) {
     list->Append(*CSSIdentifierValue::Create(CSSValueNone));
-  } else if (touch_action == kTouchActionManipulation) {
+  } else if (touch_action == TouchAction::kTouchActionManipulation) {
     list->Append(*CSSIdentifierValue::Create(CSSValueManipulation));
   } else {
-    if ((touch_action & kTouchActionPanX) == kTouchActionPanX)
+    if ((touch_action & TouchAction::kTouchActionPanX) ==
+        TouchAction::kTouchActionPanX)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanX));
-    else if (touch_action & kTouchActionPanLeft)
+    else if (touch_action & TouchAction::kTouchActionPanLeft)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanLeft));
-    else if (touch_action & kTouchActionPanRight)
+    else if (touch_action & TouchAction::kTouchActionPanRight)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanRight));
-    if ((touch_action & kTouchActionPanY) == kTouchActionPanY)
+    if ((touch_action & TouchAction::kTouchActionPanY) ==
+        TouchAction::kTouchActionPanY)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanY));
-    else if (touch_action & kTouchActionPanUp)
+    else if (touch_action & TouchAction::kTouchActionPanUp)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanUp));
-    else if (touch_action & kTouchActionPanDown)
+    else if (touch_action & TouchAction::kTouchActionPanDown)
       list->Append(*CSSIdentifierValue::Create(CSSValuePanDown));
 
-    if ((touch_action & kTouchActionPinchZoom) == kTouchActionPinchZoom)
+    if ((touch_action & TouchAction::kTouchActionPinchZoom) ==
+        TouchAction::kTouchActionPinchZoom)
       list->Append(*CSSIdentifierValue::Create(CSSValuePinchZoom));
   }
 
   DCHECK(list->length());
   return list;
 }
 
 static CSSValue* ValueForWillChange(
     const Vector<CSSPropertyID>& will_change_properties,
     bool will_change_contents,
@@ skipping 2530 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace blink