OnionSoup: Move embedded_frame_sink.mojom to public/mojom/frame_sinks

This CL moves public/platform/modules/frame_sinks to public/mojom
to gather mojom files to mojom folder and updates paths for
embedded_frame_sink.mojom.

Bug: 919393
Change-Id: If73981416f251d651fa34f114a68d9f58a14a268
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1534585Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Julie Jeongeun Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#644603}

content/browser/BUILD.gn

@@ -230,7 +230,7 @@ jumbo_source_set("browser") {
     ":accessibility_buildflags",
     "//ipc",
     "//media/mojo/interfaces:remoting",
-    "//third_party/blink/public:embedded_frame_sink_mojo_bindings",
+    "//third_party/blink/public/mojom:embedded_frame_sink_mojo_bindings",
     "//third_party/leveldatabase",
   ]
 

content/browser/DEPS

@@ -132,7 +132,6 @@ include_rules = [
   "+third_party/blink/public/platform/modules/cookie_store/cookie_store.mojom.h",
   "+third_party/blink/public/platform/modules/mediasession/media_session.mojom.h",
   "+third_party/blink/public/platform/modules/mediastream/media_devices.mojom.h",
-  "+third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom.h",
   "+third_party/blink/public/platform/modules/websockets/websocket.mojom.h",
 
   # DO NOT ADD ANY CHROME OR COMPONENTS INCLUDES HERE!!!

content/browser/renderer_host/embedded_frame_sink_impl.h

@@ -12,7 +12,7 @@
 #include "components/viz/host/host_frame_sink_client.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom.h"
 
 namespace viz {
 class HostFrameSinkManager;

content/browser/renderer_host/embedded_frame_sink_provider_impl.h

@@ -11,7 +11,7 @@
 #include "components/viz/common/surfaces/frame_sink_id.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom.h"
 
 namespace viz {
 class HostFrameSinkManager;

content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc

@@ -25,7 +25,7 @@
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom.h"
 #include "ui/compositor/compositor.h"
 
 #if !defined(OS_ANDROID)

third_party/blink/public/BUILD.gn

@@ -729,30 +729,6 @@ mojom("android_mojo_bindings") {
   export_header_blink = "third_party/blink/public/platform/web_common.h"
 }
 
-# The embedded_frame_sink_mojo_bindings is separated from the rest of mojom
-# files because its deps contain too many files in Chromium that would pollute
-# the include paths in generated mojom-blink files for other services.
-mojom("embedded_frame_sink_mojo_bindings") {
-  visibility = [ "//content/*" ]
-  visibility_blink = [ "//third_party/blink/renderer/platform" ]
-  sources = [
-    "platform/modules/frame_sinks/embedded_frame_sink.mojom",
-  ]
-  deps = [
-    "//services/viz/public/interfaces",
-  ]
-
-  component_output_prefix = "blink_embedded_frame_sink_mojo_bindings"
-
-  # See comment above
-  export_class_attribute = "CONTENT_EXPORT"
-  export_define = "CONTENT_IMPLEMENTATION=1"
-  export_header = "content/common/content_export.h"
-  export_class_attribute_blink = "BLINK_PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/public/platform/web_common.h"
-}
-
 # The core_mojo_bindings is separated from the rest of mojom files to allow its deps
 # to depend on types in WebKit/Source/core.
 mojom("core_mojo_bindings") {
@@ -794,7 +770,6 @@ group("generate_mojo_bindings") {
     # variant of the generated files.
     ":core_mojo_bindings_blink_headers",
     ":core_mojo_bindings_headers",
-    ":embedded_frame_sink_mojo_bindings_blink_headers",
     ":mojo_bindings_blink_headers",
     ":mojo_bindings_headers",
   ]

third_party/blink/public/mojom/BUILD.gn

@@ -356,6 +356,31 @@ mojom("web_client_hints_types_mojo_bindings") {
   ]
 }
 
+# The embedded_frame_sink_mojo_bindings is separated from the rest of mojom
+# files because its deps contain too many files in Chromium that would pollute
+# the include paths in generated mojom-blink files for other services.
+mojom("embedded_frame_sink_mojo_bindings") {
+  visibility = [ "//content/*" ]
+  visibility_blink = [ "//third_party/blink/renderer/platform" ]
+  sources = [
+    "frame_sinks/embedded_frame_sink.mojom",
+  ]
+  deps = [
+    "//services/viz/public/interfaces",
+  ]
+
+  component_output_prefix = "blink_embedded_frame_sink_mojo_bindings"
+
+  # The chromium variant must be linked with content and use the same export
+  # settings in component build.
+  export_class_attribute = "CONTENT_EXPORT"
+  export_define = "CONTENT_IMPLEMENTATION=1"
+  export_header = "content/common/content_export.h"
+  export_class_attribute_blink = "BLINK_PLATFORM_EXPORT"
+  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
+  export_header_blink = "third_party/blink/public/platform/web_common.h"
+}
+
 # This is a separate target because it needs unscrambled message IDs.
 mojom("authenticator_test_mojo_bindings") {
   sources = [

third_party/blink/renderer/modules/canvas/htmlcanvas/html_canvas_element_module_test.cc

@@ -10,7 +10,7 @@
 #include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/dom_node_ids.h"
 #include "third_party/blink/renderer/core/frame/local_frame_view.h"

third_party/blink/renderer/platform/BUILD.gn

@@ -1453,8 +1453,8 @@ jumbo_component("platform") {
     "//services/ws/public/cpp/gpu",
     "//skia:skcms",
     "//third_party:freetype_harfbuzz",
-    "//third_party/blink/public:embedded_frame_sink_mojo_bindings_blink",
     "//third_party/blink/public/common",
+    "//third_party/blink/public/mojom:embedded_frame_sink_mojo_bindings_blink",
     "//third_party/ced",
     "//third_party/emoji-segmenter",
     "//third_party/icu",

third_party/blink/renderer/platform/graphics/begin_frame_provider.h

@@ -7,7 +7,7 @@
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/renderer/platform/graphics/begin_frame_provider.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 

third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.cc

@@ -12,8 +12,8 @@
 #include "components/viz/common/resources/resource_format.h"
 #include "components/viz/common/resources/single_release_callback.h"
 #include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/interface_provider.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/web_graphics_context_3d_provider.h"
 #include "third_party/blink/renderer/platform/cross_thread_functional.h"

third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.h

@@ -11,7 +11,7 @@
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/renderer/platform/wtf/compiler.h"
 
 namespace blink {

third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher_test.cc

@@ -10,7 +10,7 @@
 #include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/renderer/platform/graphics/canvas_resource.h"
 #include "third_party/blink/renderer/platform/graphics/canvas_resource_provider.h"
 #include "third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h"

third_party/blink/renderer/platform/graphics/surface_layer_bridge.cc

@@ -14,8 +14,8 @@
 #include "components/viz/common/surfaces/surface_id.h"
 #include "components/viz/common/surfaces/surface_info.h"
 #include "media/base/media_switches.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/interface_provider.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/web_layer_tree_view.h"
 #include "third_party/blink/renderer/platform/mojo/mojo_helper.h"

third_party/blink/renderer/platform/graphics/surface_layer_bridge.h

@@ -12,7 +12,7 @@
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
 #include "components/viz/common/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/web_surface_layer_bridge.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 

third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h

@@ -9,7 +9,7 @@
 #include "gpu/ipc/common/mailbox.mojom-blink.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 
 namespace blink {
 

third_party/blink/renderer/platform/graphics/test/mock_embedded_frame_sink_provider.h

@@ -9,7 +9,7 @@
 
 #include "components/viz/common/surfaces/frame_sink_id.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/renderer/platform/testing/testing_platform_support.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
 

third_party/blink/renderer/platform/graphics/video_frame_submitter.cc

@@ -17,8 +17,8 @@
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
 #include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
 #include "services/ws/public/cpp/gpu/context_provider_command_buffer.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/interface_provider.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/platform/graphics/canvas_resource.h"
 

third_party/blink/renderer/platform/graphics/video_frame_submitter.h

@@ -18,7 +18,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/system/buffer.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
-#include "third_party/blink/public/platform/modules/frame_sinks/embedded_frame_sink.mojom-blink.h"
+#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
 #include "third_party/blink/public/platform/web_video_frame_submitter.h"
 #include "third_party/blink/renderer/platform/graphics/video_frame_resource_provider.h"
 #include "third_party/blink/renderer/platform/platform_export.h"

third_party/blink/tools/blinkpy/common/pretty_diff_unittest.py

@@ -30,8 +30,8 @@ class TestFileDiff(unittest.TestCase):
                  'similarity index 100%',
                  'rename from platform/modules/offscreencanvas/OWNERS',
                  'rename to platform/modules/frame_sinks/OWNERS',
-                 'diff --git a/platform/modules/frame_sinks/embedded_frame_sink.mojom ' +
-                 'b/platform/modules/frame_sinks/embedded_frame_sink.mojom']
+                 'diff --git a/mojom/frame_sinks/embedded_frame_sink.mojom ' +
+                 'b/mojom/frame_sinks/embedded_frame_sink.mojom']
         diff, remaining_lines = DiffFile.parse(lines)
         self.assertIsNotNone(diff)
         self.assertEquals(remaining_lines[0], lines[4])