Use compositor_frame typemap in Blink

third_party/WebKit/public/BUILD.gn

 # 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.
 
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
@@ skipping 632 matching lines @@
 mojom("mojo_bindings") {
   sources = [
     "platform/mime_registry.mojom",
     "platform/modules/background_sync/background_sync.mojom",
     "platform/modules/bluetooth/web_bluetooth.mojom",
     "platform/modules/broadcastchannel/broadcast_channel.mojom",
     "platform/modules/budget_service/budget_service.mojom",
     "platform/modules/hyphenation/hyphenation.mojom",
     "platform/modules/notifications/notification.mojom",
     "platform/modules/notifications/notification_service.mojom",
-    "platform/modules/offscreencanvas/offscreen_canvas_surface.mojom",
     "platform/modules/serviceworker/service_worker_event_status.mojom",
     "platform/modules/wake_lock/wake_lock_service.mojom",
   ]
   public_deps = [
     ":android_mojo_bindings",
     ":new_wrapper_types_mojo_bindings",
-    "//cc/ipc:interfaces_surfaceid_only",
     "//device/bluetooth/public/interfaces:bluetooth_mojom_bluetooth_uuid",
     "//url/mojo:url_mojom_origin",
   ]
 
   use_new_wrapper_types = false
 
   # The chromium variant must be linked with content and use the same export
   # settings in component build because of the WebBluetoothDeviceId typemap
   # inside content.
   export_class_attribute = "CONTENT_EXPORT"
@@ skipping 40 matching lines @@
 
   # 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/WebKit/public/platform/WebCommon.h"
 }
 
+# The offscreen_canvas_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("offscreen_canvas_mojo_bindings") {
+  sources = [
+    "platform/modules/offscreencanvas/offscreen_canvas_surface.mojom",
+  ]
+  deps = [
+    "//cc/ipc:interfaces",
+  ]
+
+  # 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/WebKit/public/platform/WebCommon.h"
+}
+
 group("generate_mojo_bindings") {
   deps = [
     ":mojo_bindings_blink__generator",
+    ":offscreen_canvas_mojo_bindings_blink__generator",
   ]
 }