Unify TouchAction classes

third_party/WebKit/Source/core/input/TouchActionUtil.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/input/TouchActionUtil.h"
 
 #include "core/dom/Node.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutObject.h"
@@ skipping 32 matching lines @@
 }
 
 }  // namespace
 
 TouchAction ComputeEffectiveTouchAction(const Node& node) {
   // Start by permitting all actions, then walk the elements supporting
   // touch-action from the target node up to root document, exclude any
   // prohibited actions at or below the element that supports them.
   // I.e. pan-related actions are considered up to the nearest scroller,
   // and zoom related actions are considered up to the root.
-  TouchAction effective_touch_action = kTouchActionAuto;
-  TouchAction handled_touch_actions = kTouchActionNone;
+  TouchAction effective_touch_action = TouchAction::kTouchActionAuto;
+  TouchAction handled_touch_actions = TouchAction::kTouchActionNone;
   for (const Node* cur_node = &node; cur_node;
        cur_node = ParentNodeAcrossFrames(cur_node)) {
     if (LayoutObject* layout_object = cur_node->GetLayoutObject()) {
       if (SupportsTouchAction(*layout_object)) {
         TouchAction action = layout_object->Style()->GetTouchAction();
         action |= handled_touch_actions;
         effective_touch_action &= action;
-        if (effective_touch_action == kTouchActionNone)
+        if (effective_touch_action == TouchAction::kTouchActionNone)
           break;
       }
 
       // If we've reached an ancestor that supports panning, stop allowing
       // panning to be disabled.
       if ((layout_object->IsBox() &&
            ToLayoutBox(layout_object)->ScrollsOverflow()) ||
           layout_object->IsLayoutView())
-        handled_touch_actions |= kTouchActionPan;
+        handled_touch_actions |= TouchAction::kTouchActionPan;
     }
   }
   return effective_touch_action;
 }
 
 }  // namespace TouchActionUtil
 }  // namespace blink