Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: third_party/WebKit/public/blink.gyp

Issue 2161993004: Make geometry struct_trait shared by Blink and Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'platform/modules/permissions/permission_status.mojom', 46 'platform/modules/permissions/permission_status.mojom',
47 'platform/modules/presentation/presentation.mojom', 47 'platform/modules/presentation/presentation.mojom',
48 'platform/modules/serviceworker/service_worker_event_status.mojom', 48 'platform/modules/serviceworker/service_worker_event_status.mojom',
49 'platform/modules/wake_lock/wake_lock_service.mojom', 49 'platform/modules/wake_lock/wake_lock_service.mojom',
50 'platform/modules/webshare/webshare.mojom', 50 'platform/modules/webshare/webshare.mojom',
51 ], 51 ],
52 # Duplicated in GN: //third_party/WebKit/public:android_mojo_bindings 52 # Duplicated in GN: //third_party/WebKit/public:android_mojo_bindings
53 'blink_android_mojo_sources': [ 53 'blink_android_mojo_sources': [
54 'platform/modules/payments/payment_request.mojom', 54 'platform/modules/payments/payment_request.mojom',
55 ], 55 ],
56 'blink_typemap_sources': [
57 '<(DEPTH)/cc/ipc/surface_id.typemap',
58 '<(DEPTH)/cc/ipc/surface_sequence.typemap',
59 '<(DEPTH)/ui/gfx/geometry/mojo/geometry.typemap',
60 ],
56 }, 61 },
57 'targets': [ 62 'targets': [
58 { 63 {
59 # GN version: //third_party/WebKit/public:blink 64 # GN version: //third_party/WebKit/public:blink
60 'target_name': 'blink', 65 'target_name': 'blink',
61 'type': 'none', 66 'type': 'none',
62 'dependencies': [ 67 'dependencies': [
63 'mojo_bindings', 68 'mojo_bindings',
64 '../Source/platform/blink_platform.gyp:blink_platform', 69 '../Source/platform/blink_platform.gyp:blink_platform',
65 '../Source/web/web.gyp:blink_web', 70 '../Source/web/web.gyp:blink_web',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 # GN version: //third_party/WebKit/public:mojo_bindings_blink 115 # GN version: //third_party/WebKit/public:mojo_bindings_blink
111 # (generated by //third_party/WebKit/public:mojo_bindings) 116 # (generated by //third_party/WebKit/public:mojo_bindings)
112 'target_name': 'mojo_bindings_blink_mojom', 117 'target_name': 'mojo_bindings_blink_mojom',
113 'type': 'none', 118 'type': 'none',
114 'variables': { 119 'variables': {
115 'mojom_files': [ 120 'mojom_files': [
116 '<@(blink_mojo_sources)', 121 '<@(blink_mojo_sources)',
117 '<@(blink_android_mojo_sources)', 122 '<@(blink_android_mojo_sources)',
118 ], 123 ],
119 'mojom_typemaps': [ 124 'mojom_typemaps': [
120 '<(DEPTH)/cc/ipc/surface_id.typemap', 125 '<@(blink_typemap_sources)',
121 '<(DEPTH)/cc/ipc/surface_sequence.typemap',
122
123 ], 126 ],
124 'for_blink': 'true', 127 'for_blink': 'true',
125 }, 128 },
126 'dependencies' : [ 129 'dependencies' : [
127 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink', 130 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
128 ], 131 ],
129 'includes': [ 132 'includes': [
pdr. 2016/07/20 17:35:54 nit: indentation
130 '../../../mojo/mojom_bindings_generator_explicit.gypi', 133 '../../../mojo/mojom_bindings_generator_explicit.gypi',
131 ], 134 ],
132 }, 135 },
133 { 136 {
134 # GN version: //third_party/WebKit/public:mojo_bindings 137 # GN version: //third_party/WebKit/public:mojo_bindings
135 'target_name': 'mojo_bindings_mojom', 138 'target_name': 'mojo_bindings_mojom',
136 'type': 'none', 139 'type': 'none',
137 'variables': { 140 'variables': {
138 'mojom_files': [ 141 'mojom_files': [
139 '<@(blink_mojo_sources)', 142 '<@(blink_mojo_sources)',
140 '<@(blink_android_mojo_sources)', 143 '<@(blink_android_mojo_sources)',
141 ], 144 ],
142 'mojom_typemaps': [ 145 'mojom_typemaps': [
143 '../../../device/bluetooth/public/interfaces/bluetooth_uuid.ty pemap', 146 '../../../device/bluetooth/public/interfaces/bluetooth_uuid. typemap',
144 '<(DEPTH)/cc/ipc/surface_id.typemap', 147 '<@(blink_typemap_sources)',
145 '<(DEPTH)/cc/ipc/surface_sequence.typemap',
146 ], 148 ],
147 }, 149 },
148 'dependencies' : [ 150 'dependencies' : [
149 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces', 151 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
150 ], 152 ],
151 'includes': [ 153 'includes': [
pdr. 2016/07/20 17:35:54 Nit: indentation
152 '../../../mojo/mojom_bindings_generator_explicit.gypi', 154 '../../../mojo/mojom_bindings_generator_explicit.gypi',
153 ], 155 ],
154 }, 156 },
155 { 157 {
156 # GN version: //third_party/WebKit/public:mojo_bindings 158 # GN version: //third_party/WebKit/public:mojo_bindings
157 'target_name': 'mojo_bindings', 159 'target_name': 'mojo_bindings',
158 # Needed because of dependency on generated headers. 160 # Needed because of dependency on generated headers.
159 'hard_dependency': '1', 161 'hard_dependency': '1',
160 'type': 'static_library', 162 'type': 'static_library',
161 'dependencies': [ 163 'dependencies': [
(...skipping 25 matching lines...) Expand all
187 'type': 'static_library', 189 'type': 'static_library',
188 'dependencies': [ 190 'dependencies': [
189 'android_mojo_bindings_mojom', 191 'android_mojo_bindings_mojom',
190 '../../../mojo/mojo_public.gyp:mojo_bindings_java', 192 '../../../mojo/mojo_public.gyp:mojo_bindings_java',
191 ], 193 ],
192 }, 194 },
193 ], 195 ],
194 }], 196 }],
195 ], 197 ],
196 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698