EXO: Refactor zcr_stylus interface

Move the zcr_stylus interface into its own files. This
change only moves code around, no functional changes.

Bug: 896710
Test: Build and run exo_unittests
Change-Id: I42e70263a607f6a835199b9be46093b6e0b1af35
Reviewed-on: https://chromium-review.googlesource.com/c/1481719
Commit-Queue: Daniel Nicoara <dnicoara@chromium.org>
Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635525}

components/exo/wayland/BUILD.gn

@@ -65,6 +65,8 @@ source_set("wayland") {
     "zcr_alpha_compositing.h",
     "zcr_secure_output.cc",
     "zcr_secure_output.h",
+    "zcr_stylus.cc",
+    "zcr_stylus.h",
     "zcr_vsync_feedback.cc",
     "zcr_vsync_feedback.h",
   ]

components/exo/wayland/server.cc

@@ -62,9 +62,6 @@
 #include "components/exo/gaming_seat_delegate.h"
 #include "components/exo/notification.h"
 #include "components/exo/surface.h"
-#include "components/exo/touch.h"
-#include "components/exo/touch_delegate.h"
-#include "components/exo/touch_stylus_delegate.h"
 #include "components/exo/wayland/server_util.h"
 #include "components/exo/wayland/wayland_display_output.h"
 #include "components/exo/wayland/wayland_input_delegate.h"
@@ -79,6 +76,7 @@
 #include "components/exo/wayland/wp_viewporter.h"
 #include "components/exo/wayland/zcr_alpha_compositing.h"
 #include "components/exo/wayland/zcr_secure_output.h"
+#include "components/exo/wayland/zcr_stylus.h"
 #include "components/exo/wayland/zcr_vsync_feedback.h"
 #include "components/exo/wm_helper.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
@@ -159,93 +157,6 @@ const base::FilePath::CharType kSocketName[] = FILE_PATH_LITERAL("wayland-0");
 // Group used for wayland socket.
 const char kWaylandSocketGroup[] = "wayland";
 
-////////////////////////////////////////////////////////////////////////////////
-// touch_stylus interface:
-
-class WaylandTouchStylusDelegate : public TouchStylusDelegate {
- public:
-  WaylandTouchStylusDelegate(wl_resource* resource, Touch* touch)
-      : resource_(resource), touch_(touch) {
-    touch_->SetStylusDelegate(this);
-  }
-  ~WaylandTouchStylusDelegate() override {
-    if (touch_ != nullptr)
-      touch_->SetStylusDelegate(nullptr);
-  }
-  void OnTouchDestroying(Touch* touch) override { touch_ = nullptr; }
-  void OnTouchTool(int touch_id, ui::EventPointerType type) override {
-    uint wayland_type = ZCR_TOUCH_STYLUS_V2_TOOL_TYPE_TOUCH;
-    if (type == ui::EventPointerType::POINTER_TYPE_PEN)
-      wayland_type = ZCR_TOUCH_STYLUS_V2_TOOL_TYPE_PEN;
-    else if (type == ui::EventPointerType::POINTER_TYPE_ERASER)
-      wayland_type = ZCR_TOUCH_STYLUS_V2_TOOL_TYPE_ERASER;
-    zcr_touch_stylus_v2_send_tool(resource_, touch_id, wayland_type);
-  }
-  void OnTouchForce(base::TimeTicks time_stamp,
-                    int touch_id,
-                    float force) override {
-    zcr_touch_stylus_v2_send_force(resource_,
-                                   TimeTicksToMilliseconds(time_stamp),
-                                   touch_id, wl_fixed_from_double(force));
-  }
-  void OnTouchTilt(base::TimeTicks time_stamp,
-                   int touch_id,
-                   const gfx::Vector2dF& tilt) override {
-    zcr_touch_stylus_v2_send_tilt(
-        resource_, TimeTicksToMilliseconds(time_stamp), touch_id,
-        wl_fixed_from_double(tilt.x()), wl_fixed_from_double(tilt.y()));
-  }
-
- private:
-  wl_resource* resource_;
-  Touch* touch_;
-
-  DISALLOW_COPY_AND_ASSIGN(WaylandTouchStylusDelegate);
-};
-
-void touch_stylus_destroy(wl_client* client, wl_resource* resource) {
-  wl_resource_destroy(resource);
-}
-
-const struct zcr_touch_stylus_v2_interface touch_stylus_implementation = {
-    touch_stylus_destroy};
-
-////////////////////////////////////////////////////////////////////////////////
-// stylus_v2 interface:
-
-void stylus_get_touch_stylus(wl_client* client,
-                             wl_resource* resource,
-                             uint32_t id,
-                             wl_resource* touch_resource) {
-  Touch* touch = GetUserDataAs<Touch>(touch_resource);
-  if (touch->HasStylusDelegate()) {
-    wl_resource_post_error(
-        resource, ZCR_STYLUS_V2_ERROR_TOUCH_STYLUS_EXISTS,
-        "touch has already been associated with a stylus object");
-    return;
-  }
-
-  wl_resource* stylus_resource =
-      wl_resource_create(client, &zcr_touch_stylus_v2_interface, 1, id);
-
-  SetImplementation(
-      stylus_resource, &touch_stylus_implementation,
-      std::make_unique<WaylandTouchStylusDelegate>(stylus_resource, touch));
-}
-
-const struct zcr_stylus_v2_interface stylus_v2_implementation = {
-    stylus_get_touch_stylus};
-
-void bind_stylus_v2(wl_client* client,
-                    void* data,
-                    uint32_t version,
-                    uint32_t id) {
-  wl_resource* resource =
-      wl_resource_create(client, &zcr_stylus_v2_interface, version, id);
-  wl_resource_set_implementation(resource, &stylus_v2_implementation, data,
-                                 nullptr);
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////

components/exo/wayland/zcr_stylus.cc

+// Copyright 2019 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 "components/exo/wayland/zcr_stylus.h"
+
+#include <stylus-unstable-v2-server-protocol.h>
+
+#include "components/exo/touch.h"
+#include "components/exo/touch_stylus_delegate.h"
+#include "components/exo/wayland/server_util.h"
+
+namespace exo {
+namespace wayland {
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+// touch_stylus interface:
+
+class WaylandTouchStylusDelegate : public TouchStylusDelegate {
+ public:
+  WaylandTouchStylusDelegate(wl_resource* resource, Touch* touch)
+      : resource_(resource), touch_(touch) {
+    touch_->SetStylusDelegate(this);
+  }
+  ~WaylandTouchStylusDelegate() override {
+    if (touch_ != nullptr)
+      touch_->SetStylusDelegate(nullptr);
+  }
+  void OnTouchDestroying(Touch* touch) override { touch_ = nullptr; }
+  void OnTouchTool(int touch_id, ui::EventPointerType type) override {
+    uint wayland_type = ZCR_TOUCH_STYLUS_V2_TOOL_TYPE_TOUCH;
+    if (type == ui::EventPointerType::POINTER_TYPE_PEN)
+      wayland_type = ZCR_TOUCH_STYLUS_V2_TOOL_TYPE_PEN;
+    else if (type == ui::EventPointerType::POINTER_TYPE_ERASER)
+      wayland_type = ZCR_TOUCH_STYLUS_V2_TOOL_TYPE_ERASER;
+    zcr_touch_stylus_v2_send_tool(resource_, touch_id, wayland_type);
+  }
+  void OnTouchForce(base::TimeTicks time_stamp,
+                    int touch_id,
+                    float force) override {
+    zcr_touch_stylus_v2_send_force(resource_,
+                                   TimeTicksToMilliseconds(time_stamp),
+                                   touch_id, wl_fixed_from_double(force));
+  }
+  void OnTouchTilt(base::TimeTicks time_stamp,
+                   int touch_id,
+                   const gfx::Vector2dF& tilt) override {
+    zcr_touch_stylus_v2_send_tilt(
+        resource_, TimeTicksToMilliseconds(time_stamp), touch_id,
+        wl_fixed_from_double(tilt.x()), wl_fixed_from_double(tilt.y()));
+  }
+
+ private:
+  wl_resource* resource_;
+  Touch* touch_;
+
+  DISALLOW_COPY_AND_ASSIGN(WaylandTouchStylusDelegate);
+};
+
+void touch_stylus_destroy(wl_client* client, wl_resource* resource) {
+  wl_resource_destroy(resource);
+}
+
+const struct zcr_touch_stylus_v2_interface touch_stylus_implementation = {
+    touch_stylus_destroy};
+
+////////////////////////////////////////////////////////////////////////////////
+// stylus_v2 interface:
+
+void stylus_get_touch_stylus(wl_client* client,
+                             wl_resource* resource,
+                             uint32_t id,
+                             wl_resource* touch_resource) {
+  Touch* touch = GetUserDataAs<Touch>(touch_resource);
+  if (touch->HasStylusDelegate()) {
+    wl_resource_post_error(
+        resource, ZCR_STYLUS_V2_ERROR_TOUCH_STYLUS_EXISTS,
+        "touch has already been associated with a stylus object");
+    return;
+  }
+
+  wl_resource* stylus_resource =
+      wl_resource_create(client, &zcr_touch_stylus_v2_interface, 1, id);
+
+  SetImplementation(
+      stylus_resource, &touch_stylus_implementation,
+      std::make_unique<WaylandTouchStylusDelegate>(stylus_resource, touch));
+}
+
+const struct zcr_stylus_v2_interface stylus_v2_implementation = {
+    stylus_get_touch_stylus};
+
+}  // namespace
+
+void bind_stylus_v2(wl_client* client,
+                    void* data,
+                    uint32_t version,
+                    uint32_t id) {
+  wl_resource* resource =
+      wl_resource_create(client, &zcr_stylus_v2_interface, version, id);
+  wl_resource_set_implementation(resource, &stylus_v2_implementation, data,
+                                 nullptr);
+}
+
+}  // namespace wayland
+}  // namespace exo

components/exo/wayland/zcr_stylus.h

+// Copyright 2019 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.
+
+#ifndef COMPONENTS_EXO_WAYLAND_ZCR_STYLUS_H_
+#define COMPONENTS_EXO_WAYLAND_ZCR_STYLUS_H_
+
+#include <stdint.h>
+
+struct wl_client;
+
+namespace exo {
+namespace wayland {
+
+void bind_stylus_v2(wl_client* client,
+                    void* data,
+                    uint32_t version,
+                    uint32_t id);
+
+}  // namespace wayland
+}  // namespace exo
+
+#endif  // COMPONENTS_EXO_WAYLAND_ZCR_STYLUS_H_