Unify TouchAction classes

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

 // Copyright 2016 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/TouchEventManager.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/events/TouchEvent.h"
 #include "core/frame/Deprecation.h"
@@ skipping 89 matching lines @@
 TouchEventManager::TouchEventManager(LocalFrame& frame) : frame_(frame) {
   Clear();
 }
 
 void TouchEventManager::Clear() {
   touch_sequence_document_.Clear();
   target_for_touch_id_.clear();
   region_for_touch_id_.clear();
   touch_pressed_ = false;
   suppressing_touchmoves_within_slop_ = false;
-  current_touch_action_ = kTouchActionAuto;
+  current_touch_action_ = TouchAction::kTouchActionAuto;
 }
 
 DEFINE_TRACE(TouchEventManager) {
   visitor->Trace(frame_);
   visitor->Trace(touch_sequence_document_);
   visitor->Trace(target_for_touch_id_);
 }
 
 WebInputEventResult TouchEventManager::DispatchTouchEvents(
     const WebTouchEvent& event,
@@ skipping 69 matching lines @@
       if (!changed_touches[point_state].touches_)
         changed_touches[point_state].touches_ = TouchList::Create();
       changed_touches[point_state].touches_->Append(touch);
       changed_touches[point_state].targets_.insert(touch_info.touch_node);
       changed_touches[point_state].pointer_type_ = point.pointer_type;
     }
   }
 
   if (all_touches_released) {
     touch_sequence_document_.Clear();
-    current_touch_action_ = kTouchActionAuto;
+    current_touch_action_ = TouchAction::kTouchActionAuto;
   }
 
   WebInputEventResult event_result = WebInputEventResult::kNotHandled;
 
   // Now iterate through the |changedTouches| list and |m_targets| within it,
   // sending TouchEvents to the targets as required.
   for (unsigned state = 0; state <= WebTouchPoint::kStateMax; ++state) {
     if (!changed_touches[state].touches_)
       continue;
 
@@ skipping 151 matching lines @@
       // down. However EventSender allows this to be violated and there's
       // some tests that take advantage of it. There may also be edge
       // cases in the browser where this happens.
       // See http://crbug.com/345372.
       target_for_touch_id_.Set(touch_info.point.id, touch_info.touch_node);
 
       region_for_touch_id_.Set(touch_info.point.id, touch_info.region);
 
       TouchAction effective_touch_action =
           TouchActionUtil::ComputeEffectiveTouchAction(*touch_info.touch_node);
-      if (effective_touch_action != kTouchActionAuto) {
+      if (effective_touch_action != TouchAction::kTouchActionAuto) {
         frame_->GetPage()->GetChromeClient().SetTouchAction(
             frame_, effective_touch_action);
 
         // Combine the current touch action sequence with the touch action
         // for the current finger press.
         current_touch_action_ &= effective_touch_action;
       }
     }
   }
 }
@@ skipping 135 matching lines @@
   }
 
   return DispatchTouchEvents(event, touch_infos, all_touches_released);
 }
 
 bool TouchEventManager::IsAnyTouchActive() const {
   return touch_pressed_;
 }
 
 }  // namespace blink