Unify TouchAction classes

third_party/WebKit/Source/web/tests/TouchActionTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "core/dom/StaticNodeList.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/exported/WebViewBase.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/layout/api/LayoutViewItem.h"
+#include "platform/graphics/TouchAction.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCoalescedInputEvent.h"
 #include "public/platform/WebTouchEvent.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebHitTestResult.h"
-#include "public/web/WebTouchAction.h"
 #include "public/web/WebView.h"
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWidgetClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/tests/FrameTestHelpers.h"
 
 using blink::testing::RunPendingTasks;
 
 namespace blink {
 
 class TouchActionTrackingWebWidgetClient
     : public FrameTestHelpers::TestWebWidgetClient {
  public:
   TouchActionTrackingWebWidgetClient()
-      : action_set_count_(0), action_(kWebTouchActionAuto) {}
+      : action_set_count_(0), action_(TouchAction::kTouchActionAuto) {}
 
   // WebWidgetClient methods
-  void SetTouchAction(WebTouchAction touch_action) override {
+  void SetTouchAction(TouchAction touch_action) override {
     action_set_count_++;
     action_ = touch_action;
   }
 
   // Local methods
   void Reset() {
     action_set_count_ = 0;
-    action_ = kWebTouchActionAuto;
+    action_ = TouchAction::kTouchActionAuto;
   }
 
   int TouchActionSetCount() { return action_set_count_; }
 
-  WebTouchAction LastTouchAction() { return action_; }
+  TouchAction LastTouchAction() { return action_; }
 
  private:
   int action_set_count_;
-  WebTouchAction action_;
+  TouchAction action_;
 };
 
 const int kKfakeTouchId = 7;
 
 class TouchActionTest : public ::testing::Test {
  public:
   TouchActionTest() : base_url_("http://www.test.com/") {
     URLTestHelpers::RegisterMockedURLLoadFromBase(
         WebString::FromUTF8(base_url_), testing::WebTestDataPath(),
         "touch-action-tests.css");
@@ skipping 232 matching lines @@
                  .Utf8()
                  .data();
 
       // Now send the touch event and check any touch action result.
       SendTouchEvent(web_view, WebInputEvent::kTouchStart, window_point);
 
       AtomicString expected_action = element->getAttribute("expected-action");
       if (expected_action == "auto") {
         // Auto is the default - no action set.
         EXPECT_EQ(0, client.TouchActionSetCount()) << failure_context_pos;
-        EXPECT_EQ(kWebTouchActionAuto, client.LastTouchAction())
+        EXPECT_EQ(TouchAction::kTouchActionAuto, client.LastTouchAction())
             << failure_context_pos;
       } else {
         // Should have received exactly one touch action.
         EXPECT_EQ(1, client.TouchActionSetCount()) << failure_context_pos;
         if (client.TouchActionSetCount()) {
           if (expected_action == "none") {
-            EXPECT_EQ(kWebTouchActionNone, client.LastTouchAction())
+            EXPECT_EQ(TouchAction::kTouchActionNone, client.LastTouchAction())
                 << failure_context_pos;
           } else if (expected_action == "pan-x") {
-            EXPECT_EQ(kWebTouchActionPanX, client.LastTouchAction())
+            EXPECT_EQ(TouchAction::kTouchActionPanX, client.LastTouchAction())
                 << failure_context_pos;
           } else if (expected_action == "pan-y") {
-            EXPECT_EQ(kWebTouchActionPanY, client.LastTouchAction())
+            EXPECT_EQ(TouchAction::kTouchActionPanY, client.LastTouchAction())
                 << failure_context_pos;
           } else if (expected_action == "pan-x-y") {
-            EXPECT_EQ((kWebTouchActionPan), client.LastTouchAction())
+            EXPECT_EQ((TouchAction::kTouchActionPan), client.LastTouchAction())
                 << failure_context_pos;
           } else if (expected_action == "manipulation") {
-            EXPECT_EQ((kWebTouchActionManipulation), client.LastTouchAction())
+            EXPECT_EQ((TouchAction::kTouchActionManipulation),
+                      client.LastTouchAction())
                 << failure_context_pos;
           } else {
             FAIL() << "Unrecognized expected-action \""
                    << expected_action.Ascii().data() << "\" "
                    << failure_context_pos;
           }
         }
       }
 
       // Reset webview touch state.
@@ skipping 45 matching lines @@
 
 TEST_F(TouchActionTest, ShadowDOM) {
   RunShadowDOMTest("touch-action-shadow-dom.html");
 }
 
 TEST_F(TouchActionTest, Pan) {
   RunTouchActionTest("touch-action-pan.html");
 }
 
 }  // namespace blink