Index: third_party/WebKit/public/blink.gyp |
diff --git a/third_party/WebKit/public/blink.gyp b/third_party/WebKit/public/blink.gyp |
index 83edc751ed00ec698f1f160eb9aa5ebf51509f58..95d123d2ae832040d94e9634a77dc9b538bcc325 100644 |
--- a/third_party/WebKit/public/blink.gyp |
+++ b/third_party/WebKit/public/blink.gyp |
@@ -45,6 +45,7 @@ |
'platform/modules/offscreencanvas/offscreen_canvas_surface.mojom', |
'platform/modules/permissions/permission.mojom', |
'platform/modules/permissions/permission_status.mojom', |
+ 'platform/modules/presentation/presentation.mojom', |
'platform/modules/serviceworker/service_worker_event_status.mojom', |
'platform/modules/wake_lock/wake_lock_service.mojom', |
'platform/modules/webshare/webshare.mojom', |
@@ -53,10 +54,6 @@ |
'blink_android_mojo_sources': [ |
'platform/modules/payments/payment_request.mojom', |
], |
- # Duplicated in GN: //third_party/WebKit/public:new_wrapper_types_mojo_bindings |
- 'blink_new_wrapper_types_mojo_sources': [ |
- 'platform/modules/presentation/presentation.mojom', |
- ], |
'blink_typemap_sources': [ |
'<(DEPTH)/cc/ipc/surface_id.typemap', |
'<(DEPTH)/cc/ipc/surface_sequence.typemap', |
@@ -140,29 +137,6 @@ |
], |
}, |
{ |
- # GN version: //third_party/WebKit/public:new_wrapper_types_mojo_bindings_blink |
- # (generated by //third_party/WebKit/public:new_wrapper_types_mojo_bindings) |
- 'target_name': 'new_wrapper_types_mojo_bindings_blink_mojom', |
- 'type': 'none', |
- 'variables': { |
- 'mojom_files': [ |
- '<@(blink_new_wrapper_types_mojo_sources)', |
- ], |
- 'mojom_typemaps': [ |
- '../Source/platform/mojo/SecurityOrigin.typemap', |
- '<@(blink_typemap_sources)', |
- ], |
- 'for_blink': 'true', |
- }, |
- 'dependencies' : [ |
- '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink', |
- '<(DEPTH)/url/url.gyp:url_mojom_for_blink', |
- ], |
- 'includes': [ |
- '../../../mojo/mojom_bindings_generator_explicit.gypi', |
- ], |
- }, |
- { |
# GN version: //third_party/WebKit/public:mojo_bindings |
'target_name': 'mojo_bindings_mojom', |
'type': 'none', |
@@ -187,27 +161,6 @@ |
], |
}, |
{ |
- # GN version: //third_party/WebKit/public:new_wrapper_types_mojo_bindings |
- 'target_name': 'new_wrapper_types_mojo_bindings_mojom', |
- 'type': 'none', |
- 'variables': { |
- 'mojom_files': [ |
- '<@(blink_new_wrapper_types_mojo_sources)', |
- ], |
- 'mojom_typemaps': [ |
- '<(DEPTH)/url/mojo/origin.typemap', |
- '<@(blink_typemap_sources)', |
- ], |
- }, |
- 'dependencies' : [ |
- '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', |
- '<(DEPTH)/url/url.gyp:url_mojom', |
- ], |
- 'includes': [ |
- '../../../mojo/mojom_bindings_generator_explicit.gypi', |
- ], |
- }, |
- { |
# GN version: //third_party/WebKit/public:mojo_bindings |
'target_name': 'mojo_bindings', |
# Needed because of dependency on generated headers. |
@@ -216,8 +169,6 @@ |
'dependencies': [ |
'mojo_bindings_blink_mojom', |
'mojo_bindings_mojom', |
- 'new_wrapper_types_mojo_bindings_blink_mojom', |
- 'new_wrapper_types_mojo_bindings_mojom', |
'../../../mojo/mojo_public.gyp:mojo_cpp_bindings', |
'../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom', |
'<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', |