Implement cc::SurfaceId StructTraits

components/mus/public/cpp/surfaces/surfaces_type_converters.h

 // Copyright 2014 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_MUS_PUBLIC_CPP_SURFACES_SURFACES_TYPE_CONVERTERS_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_SURFACES_SURFACES_TYPE_CONVERTERS_H_
 
 #include <memory>
 
+#include "cc/ipc/surface_id.mojom.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/transferable_resource.h"
 #include "cc/surfaces/surface_id.h"
 #include "components/mus/public/cpp/surfaces/mojo_surfaces_export.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
 #include "components/mus/public/interfaces/quads.mojom.h"
-#include "components/mus/public/interfaces/surface_id.mojom.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
 class CompositorFrame;
 class CompositorFrameMetadata;
 class DrawQuad;
 class RenderPass;
 class RenderPassId;
 class SharedQuadState;
 }  // namespace cc
 
 namespace mojo {
 
 class CustomSurfaceConverter;
 
-// Types from surface_id.mojom
-template <>
-struct MOJO_SURFACES_EXPORT
-    TypeConverter<mus::mojom::SurfaceIdPtr, cc::SurfaceId> {
-  static mus::mojom::SurfaceIdPtr Convert(const cc::SurfaceId& input);
-};
-template <>
-struct MOJO_SURFACES_EXPORT
-    TypeConverter<cc::SurfaceId, mus::mojom::SurfaceIdPtr> {
-  static cc::SurfaceId Convert(const mus::mojom::SurfaceIdPtr& input);
-};
-
 // Types from quads.mojom
 template <>
 struct MOJO_SURFACES_EXPORT TypeConverter<mus::mojom::ColorPtr, SkColor> {
   static mus::mojom::ColorPtr Convert(const SkColor& input);
 };
 template <>
 struct MOJO_SURFACES_EXPORT TypeConverter<SkColor, mus::mojom::ColorPtr> {
   static SkColor Convert(const mus::mojom::ColorPtr& input);
 };
 
@@ skipping 94 matching lines @@
 template <>
 struct MOJO_SURFACES_EXPORT TypeConverter<std::unique_ptr<cc::CompositorFrame>,
                                           mus::mojom::CompositorFramePtr> {
   static std::unique_ptr<cc::CompositorFrame> Convert(
       const mus::mojom::CompositorFramePtr& input);
 };
 
 }  // namespace mojo
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_SURFACES_SURFACES_TYPE_CONVERTERS_H_