Enforce clang-format formatting on host/libs/wayland

Bug: b/512215781

Author: Databean

base/cvd/cuttlefish/host/libs/wayland/BUILD.bazel

@@ -30,7 +30,6 @@ cf_cc_library(
         "wayland_utils.h",
         "wayland_virtio_gpu_metadata.h",
     ],
-    clang_format_enabled = False,
     deps = [
         "//cuttlefish/common/libs/fs",
         "//libbase",

base/cvd/cuttlefish/host/libs/wayland/wayland_compositor.cpp

@@ -17,9 +17,8 @@
 #include "cuttlefish/host/libs/wayland/wayland_compositor.h"
 
 #include "absl/log/log.h"
-
-#include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
+#include "wayland-server-core.h"
+#include "wayland-server-protocol.h"
 
 #include "cuttlefish/host/libs/wayland/wayland_surface.h"
 #include "cuttlefish/host/libs/wayland/wayland_utils.h"
@@ -33,12 +32,8 @@ void region_destroy(wl_client*, wl_resource* region_resource) {
   wl_resource_destroy(region_resource);
 }
 
-void region_add(wl_client*,
-                wl_resource* region_resource,
-                int32_t x,
-                int32_t y,
-                int32_t w,
-                int32_t h) {
+void region_add(wl_client*, wl_resource* region_resource, int32_t x, int32_t y,
+                int32_t w, int32_t h) {
   VLOG(1) << __FUNCTION__ << " region=" << region_resource << " x=" << x
           << " y=" << y << " w=" << w << " h=" << h;
 
@@ -49,12 +44,8 @@ void region_add(wl_client*,
   region->h = h;
 }
 
-void region_subtract(wl_client*,
-                     wl_resource* region_resource,
-                     int32_t x,
-                     int32_t y,
-                     int32_t w,
-                     int32_t h) {
+void region_subtract(wl_client*, wl_resource* region_resource, int32_t x,
+                     int32_t y, int32_t w, int32_t h) {
   VLOG(1) << __FUNCTION__ << " region=" << region_resource << " x=" << x
           << " y=" << y << " w=" << w << " h=" << h;
 }
@@ -71,23 +62,16 @@ void surface_destroy(wl_client*, wl_resource* surface) {
   delete GetUserData<Surface>(surface);
 }
 
-void surface_attach(wl_client*,
-                    wl_resource* surface,
-                    wl_resource* buffer,
-                    int32_t x,
-                    int32_t y) {
+void surface_attach(wl_client*, wl_resource* surface, wl_resource* buffer,
+                    int32_t x, int32_t y) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface << " buffer=" << buffer
           << " x=" << x << " y=" << y;
 
   GetUserData<Surface>(surface)->Attach(buffer);
 }
 
-void surface_damage(wl_client*,
-                    wl_resource* surface_resource,
-                    int32_t x,
-                    int32_t y,
-                    int32_t w,
-                    int32_t h) {
+void surface_damage(wl_client*, wl_resource* surface_resource, int32_t x,
+                    int32_t y, int32_t w, int32_t h) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface_resource << " x=" << x
           << " y=" << y << " w=" << w << " h=" << h;
 }
@@ -96,8 +80,7 @@ void surface_frame(wl_client*, wl_resource* surface, uint32_t) {
   VLOG(1) << " surface=" << surface;
 }
 
-void surface_set_opaque_region(wl_client*,
-                               wl_resource* surface_resource,
+void surface_set_opaque_region(wl_client*, wl_resource* surface_resource,
                                wl_resource* region_resource) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface_resource
           << " region=" << region_resource;
@@ -108,8 +91,7 @@ void surface_set_opaque_region(wl_client*,
   surface->SetRegion(*region);
 }
 
-void surface_set_input_region(wl_client*,
-                              wl_resource* surface_resource,
+void surface_set_input_region(wl_client*, wl_resource* surface_resource,
                               wl_resource* region_resource) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface_resource
           << " region=" << region_resource;
@@ -121,47 +103,40 @@ void surface_commit(wl_client*, wl_resource* surface_resource) {
   GetUserData<Surface>(surface_resource)->Commit();
 }
 
-void surface_set_buffer_transform(wl_client*,
-                                  wl_resource* surface_resource,
+void surface_set_buffer_transform(wl_client*, wl_resource* surface_resource,
                                   int32_t transform) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface_resource
           << " transform=" << transform;
 }
 
-void surface_set_buffer_scale(wl_client*,
-                              wl_resource* surface_resource,
+void surface_set_buffer_scale(wl_client*, wl_resource* surface_resource,
                               int32_t scale) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface_resource
           << " scale=" << scale;
 }
 
-void surface_damage_buffer(wl_client*,
-                           wl_resource* surface_resource,
-                           int32_t x,
-                           int32_t y,
-                           int32_t w,
-                           int32_t h) {
+void surface_damage_buffer(wl_client*, wl_resource* surface_resource, int32_t x,
+                           int32_t y, int32_t w, int32_t h) {
   VLOG(1) << __FUNCTION__ << " surface=" << surface_resource << " x=" << x
           << " y=" << y << " w=" << w << " h=" << h;
 }
 
 const struct wl_surface_interface surface_implementation = {
-  .destroy = surface_destroy,
-  .attach = surface_attach,
-  .damage = surface_damage,
-  .frame = surface_frame,
-  .set_opaque_region = surface_set_opaque_region,
-  .set_input_region = surface_set_input_region,
-  .commit = surface_commit,
-  .set_buffer_transform = surface_set_buffer_transform,
-  .set_buffer_scale = surface_set_buffer_scale,
-  .damage_buffer = surface_damage_buffer,
+    .destroy = surface_destroy,
+    .attach = surface_attach,
+    .damage = surface_damage,
+    .frame = surface_frame,
+    .set_opaque_region = surface_set_opaque_region,
+    .set_input_region = surface_set_input_region,
+    .commit = surface_commit,
+    .set_buffer_transform = surface_set_buffer_transform,
+    .set_buffer_scale = surface_set_buffer_scale,
+    .damage_buffer = surface_damage_buffer,
 };
 
 void surface_destroy_resource_callback(struct wl_resource*) {}
 
-void compositor_create_surface(wl_client* client,
-                               wl_resource* compositor,
+void compositor_create_surface(wl_client* client, wl_resource* compositor,
                                uint32_t id) {
   VLOG(1) << __FUNCTION__ << " compositor=" << compositor << " id=" << id;
 
@@ -175,15 +150,14 @@ void compositor_create_surface(wl_client* client,
                                  surface, surface_destroy_resource_callback);
 }
 
-void compositor_create_region(wl_client* client,
-                              wl_resource* compositor,
+void compositor_create_region(wl_client* client, wl_resource* compositor,
                               uint32_t id) {
   VLOG(1) << __FUNCTION__ << " compositor=" << compositor << " id=" << id;
 
   std::unique_ptr<Surface::Region> region(new Surface::Region());
 
-  wl_resource* region_resource = wl_resource_create(
-      client, &wl_region_interface, 1, id);
+  wl_resource* region_resource =
+      wl_resource_create(client, &wl_region_interface, 1, id);
 
   wl_resource_set_implementation(region_resource, &region_implementation,
                                  region.release(),
@@ -199,9 +173,7 @@ constexpr const uint32_t kCompositorVersion = 3;
 
 void compositor_destroy_resource_callback(struct wl_resource*) {}
 
-void bind_compositor(wl_client* client,
-                     void* data,
-                     uint32_t version,
+void bind_compositor(wl_client* client, void* data, uint32_t version,
                      uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &wl_compositor_interface,

base/cvd/cuttlefish/host/libs/wayland/wayland_compositor.h

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-
 #pragma once
 
 #include <stdint.h>
 
-#include <wayland-server-core.h>
+#include "wayland-server-core.h"
 
 #include "cuttlefish/host/libs/wayland/wayland_surfaces.h"
 
@@ -28,4 +27,4 @@ namespace wayland {
 // Binds the compositor interface to the given wayland server.
 void BindCompositorInterface(wl_display* display, Surfaces* surfaces);
 
-}  // namespace wayland
+}  // namespace wayland

base/cvd/cuttlefish/host/libs/wayland/wayland_dmabuf.cpp

@@ -17,20 +17,18 @@
 #include "cuttlefish/host/libs/wayland/wayland_dmabuf.h"
 
 #include "absl/log/log.h"
-
-#include <drm/drm_fourcc.h>
-
-#include <linux-dmabuf-unstable-v1-server-protocol.h>
-#include <wayland-server-core.h>
-#include <wayland-server-protocol.h>
+#include "drm/drm_fourcc.h"
+#include "linux-dmabuf-unstable-v1-server-protocol.h"
+#include "wayland-server-core.h"
+#include "wayland-server-protocol.h"
 
 #include "cuttlefish/host/libs/wayland/wayland_utils.h"
 
 namespace wayland {
 namespace {
 
 void buffer_destroy_resource(struct wl_resource* buffer_resource) {
-	wl_resource_destroy(buffer_resource);
+  wl_resource_destroy(buffer_resource);
 }
 
 void buffer_destroy(wl_client*, wl_resource* dmabuf_resource) {
@@ -47,7 +45,7 @@ const struct wl_buffer_interface buffer_implementation = {
 };
 
 void params_destroy_resource(struct wl_resource* params_resource) {
-	wl_resource_destroy(params_resource);
+  wl_resource_destroy(params_resource);
 }
 
 void params_destroy(struct wl_client*, struct wl_resource* params_resource) {
@@ -59,13 +57,8 @@ void params_destroy(struct wl_client*, struct wl_resource* params_resource) {
   }
 }
 
-void params_add(wl_client*,
-                wl_resource* params,
-                int32_t fd,
-                uint32_t plane,
-                uint32_t offset,
-                uint32_t stride,
-                uint32_t modifier_hi,
+void params_add(wl_client*, wl_resource* params, int32_t fd, uint32_t plane,
+                uint32_t offset, uint32_t stride, uint32_t modifier_hi,
                 uint32_t modifier_lo) {
   VLOG(1) << __FUNCTION__ << " params=" << params << " fd=" << fd
           << " plane=" << plane << " offset=" << offset << " stride=" << stride
@@ -85,12 +78,8 @@ void params_add(wl_client*,
   dmabuf_params->planes[plane] = std::move(dma_plane);
 }
 
-void params_create(wl_client* client,
-                   wl_resource* params,
-                   int32_t w,
-                   int32_t h,
-                   uint32_t format,
-                   uint32_t flags) {
+void params_create(wl_client* client, wl_resource* params, int32_t w, int32_t h,
+                   uint32_t format, uint32_t flags) {
   VLOG(1) << __FUNCTION__ << " params=" << params << " w=" << w << " h=" << h
           << " format=" << format << " flags=" << flags;
 
@@ -112,12 +101,8 @@ void params_create(wl_client* client,
   zwp_linux_buffer_params_v1_send_created(params, buffer_resource);
 }
 
-void params_create_immed(wl_client* client,
-                         wl_resource* params,
-                         uint32_t id,
-                         int32_t w,
-                         int32_t h,
-                         uint32_t format,
+void params_create_immed(wl_client* client, wl_resource* params, uint32_t id,
+                         int32_t w, int32_t h, uint32_t format,
                          uint32_t flags) {
   VLOG(1) << __FUNCTION__ << " params=" << params << " id=" << id << " w=" << w
           << " h=" << h << " format=" << format << " flags=" << flags;
@@ -135,16 +120,15 @@ const struct zwp_linux_buffer_params_v1_interface
         .add = params_add,
         .create = params_create,
         .create_immed = params_create_immed,
-    };
+};
 
 void linux_dmabuf_destroy(wl_client*, wl_resource* dmabuf) {
   VLOG(1) << __FUNCTION__ << " dmabuf=" << dmabuf;
 
   wl_resource_destroy(dmabuf);
 }
 
-void linux_dmabuf_create_params(wl_client* client,
-                                wl_resource* display,
+void linux_dmabuf_create_params(wl_client* client, wl_resource* display,
                                 uint32_t id) {
   VLOG(1) << __FUNCTION__ << " display=" << display << " id=" << id;
 
@@ -155,21 +139,18 @@ void linux_dmabuf_create_params(wl_client* client,
 
   wl_resource_set_implementation(buffer_params_resource,
                                  &zwp_linux_buffer_params_implementation,
-                                 dmabuf_params,
-                                 &params_destroy_resource);
+                                 dmabuf_params, &params_destroy_resource);
 }
 
-const struct zwp_linux_dmabuf_v1_interface
-    zwp_linux_dmabuf_v1_implementation = {
+const struct zwp_linux_dmabuf_v1_interface zwp_linux_dmabuf_v1_implementation =
+    {
         .destroy = linux_dmabuf_destroy,
         .create_params = linux_dmabuf_create_params,
-    };
+};
 
 constexpr uint32_t kLinuxDmabufVersion = 2;
 
-void bind_linux_dmabuf(wl_client* client,
-                       void* data,
-                       uint32_t version,
+void bind_linux_dmabuf(wl_client* client, void* data, uint32_t version,
                        uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &zwp_linux_dmabuf_v1_interface,
@@ -184,13 +165,13 @@ void bind_linux_dmabuf(wl_client* client,
 }  // namespace
 
 void BindDmabufInterface(wl_display* display) {
-  wl_global_create(display, &zwp_linux_dmabuf_v1_interface,
-                   kLinuxDmabufVersion, nullptr, bind_linux_dmabuf);
+  wl_global_create(display, &zwp_linux_dmabuf_v1_interface, kLinuxDmabufVersion,
+                   nullptr, bind_linux_dmabuf);
 }
 
 bool IsDmabufResource(struct wl_resource* resource) {
   return wl_resource_instance_of(resource, &wl_buffer_interface,
                                  &buffer_implementation);
 }
 
-}  // namespace wayland
+}  // namespace wayland

base/cvd/cuttlefish/host/libs/wayland/wayland_dmabuf.h

@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-
 #pragma once
 
 #include <stdint.h>
-#include <map>
 
-#include <android-base/unique_fd.h>
+#include <map>
 
-#include <wayland-server-core.h>
+#include "android-base/unique_fd.h"
+#include "wayland-server-core.h"
 
 namespace wayland {
 
@@ -60,4 +59,4 @@ void BindDmabufInterface(wl_display* display);
 
 bool IsDmabufResource(struct wl_resource* resource);
 
-}  // namespace wayland
+}  // namespace wayland