summaryrefslogtreecommitdiffstats
path: root/chromium/webkit/child/webkit_child.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/webkit/child/webkit_child.gyp')
-rw-r--r--chromium/webkit/child/webkit_child.gyp49
1 files changed, 1 insertions, 48 deletions
diff --git a/chromium/webkit/child/webkit_child.gyp b/chromium/webkit/child/webkit_child.gyp
index 141b1ac0092..e4ac2d20a3a 100644
--- a/chromium/webkit/child/webkit_child.gyp
+++ b/chromium/webkit/child/webkit_child.gyp
@@ -40,11 +40,10 @@
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
'<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
- '<(DEPTH)/ui/ui.gyp:ui',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
- '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
'<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
],
'include_dirs': [
@@ -55,63 +54,17 @@
# include the header generated above.
'hard_dependency': 1,
'sources': [
- 'fling_animator_impl_android.cc',
- 'fling_animator_impl_android.h',
- 'fling_curve_configuration.cc',
- 'fling_curve_configuration.h',
- 'ftp_directory_listing_response_delegate.cc',
- 'ftp_directory_listing_response_delegate.h',
'multipart_response_delegate.cc',
'multipart_response_delegate.h',
'resource_loader_bridge.cc',
'resource_loader_bridge.h',
- 'touch_fling_gesture_curve.cc',
- 'touch_fling_gesture_curve.h',
- 'web_discardable_memory_impl.cc',
- 'web_discardable_memory_impl.h',
- 'webfallbackthemeengine_impl.cc',
- 'webfallbackthemeengine_impl.h',
'webkit_child_export.h',
- 'webkit_child_helpers.cc',
- 'webkit_child_helpers.h',
- 'webkitplatformsupport_child_impl.cc',
- 'webkitplatformsupport_child_impl.h',
- 'webkitplatformsupport_impl.cc',
- 'webkitplatformsupport_impl.h',
- 'websocketstreamhandle_bridge.h',
- 'websocketstreamhandle_delegate.h',
- 'websocketstreamhandle_impl.cc',
- 'websocketstreamhandle_impl.h',
- 'webthemeengine_impl_android.cc',
- 'webthemeengine_impl_android.h',
- 'webthemeengine_impl_default.cc',
- 'webthemeengine_impl_default.h',
- 'webthemeengine_impl_mac.cc',
- 'webthemeengine_impl_mac.h',
- 'webthemeengine_impl_win.cc',
- 'webthemeengine_impl_win.h',
- 'webthread_impl.cc',
- 'webthread_impl.h',
- 'weburlloader_impl.cc',
- 'weburlloader_impl.h',
- 'weburlrequest_extradata_impl.cc',
- 'weburlrequest_extradata_impl.h',
'weburlresponse_extradata_impl.cc',
'weburlresponse_extradata_impl.h',
- 'worker_task_runner.cc',
- 'worker_task_runner.h',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267 ],
'conditions': [
- ['use_default_render_theme==0',
- {
- 'sources/': [
- ['exclude', 'webthemeengine_impl_default.cc'],
- ['exclude', 'webthemeengine_impl_default.h'],
- ],
- }
- ],
['OS=="mac"',
{
'link_settings': {