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

Unified Diff: webkit/glue/webkit_glue.gypi

Issue 20003004: reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & allocator dep for components_unittests in shared_library2 Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/glue/webkit_glue_common.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index a12d4c6fc6be7fff01887d219c8f59db29497c16..396ddc83339d9925120fc609c5de11462f85d0cf 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -19,26 +19,38 @@
],
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:base_static',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
'<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
'<(DEPTH)/ui/ui.gyp:ui',
-
- # TODO(scottmg): crbug.com/237249
- 'glue',
+ '<(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',
+ '<(DEPTH)/webkit/plugins/webkit_plugins.gyp:plugins_common',
],
'include_dirs': [
# For JNI generated header.
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
+ 'hard_dependency': 1,
'sources': [
'../child/fling_animator_impl_android.cc',
'../child/fling_animator_impl_android.h',
'../child/fling_curve_configuration.cc',
'../child/fling_curve_configuration.h',
+ '../child/ftp_directory_listing_response_delegate.cc',
+ '../child/ftp_directory_listing_response_delegate.h',
+ '../child/multipart_response_delegate.cc',
+ '../child/multipart_response_delegate.h',
+ '../child/resource_loader_bridge.cc',
+ '../child/resource_loader_bridge.h',
'../child/touch_fling_gesture_curve.cc',
'../child/touch_fling_gesture_curve.h',
'../child/web_discardable_memory_impl.cc',
@@ -46,8 +58,15 @@
'../child/webfallbackthemeengine_impl.cc',
'../child/webfallbackthemeengine_impl.h',
'../child/webkit_child_export.h',
+ '../child/webkit_child_helpers.cc',
+ '../child/webkit_child_helpers.h',
'../child/webkitplatformsupport_child_impl.cc',
'../child/webkitplatformsupport_child_impl.h',
+ '../child/webkitplatformsupport_impl.cc',
+ '../child/webkitplatformsupport_impl.h',
+ '../child/websocketstreamhandle_delegate.h',
+ '../child/websocketstreamhandle_impl.cc',
+ '../child/websocketstreamhandle_impl.h',
'../child/webthemeengine_impl_android.cc',
'../child/webthemeengine_impl_android.h',
'../child/webthemeengine_impl_default.cc',
@@ -58,10 +77,19 @@
'../child/webthemeengine_impl_win.h',
'../child/webthread_impl.cc',
'../child/webthread_impl.h',
+ '../child/weburlloader_impl.cc',
+ '../child/weburlloader_impl.h',
+ '../child/weburlrequest_extradata_impl.cc',
+ '../child/weburlrequest_extradata_impl.h',
+ '../child/weburlresponse_extradata_impl.cc',
+ '../child/weburlresponse_extradata_impl.h',
'../child/worker_task_runner.cc',
'../child/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/': [
@@ -129,13 +157,7 @@
'<(SHARED_INTERMEDIATE_DIR)/ui',
],
'sources': [
- 'ftp_directory_listing_response_delegate.cc',
- 'ftp_directory_listing_response_delegate.h',
'network_list_observer.h',
- 'resource_loader_bridge.cc',
- 'resource_loader_bridge.h',
- 'resource_type.cc',
- 'resource_type.h',
'simple_webmimeregistry_impl.cc',
'simple_webmimeregistry_impl.h',
'webfileutilities_impl.cc',
@@ -143,14 +165,7 @@
'webkit_glue.cc',
'webkit_glue.h',
'webkit_glue_export.h',
- 'webkitplatformsupport_impl.cc',
- 'webkitplatformsupport_impl.h',
'websocketstreamhandle_bridge.h',
- 'websocketstreamhandle_delegate.h',
- 'websocketstreamhandle_impl.cc',
- 'websocketstreamhandle_impl.h',
- 'weburlloader_impl.cc',
- 'weburlloader_impl.h',
],
# When glue is a dependency, it needs to be a hard dependency.
# Dependents may rely on files generated by this target or one of its
@@ -186,6 +201,11 @@
}],
],
}],
+ ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
],
},
],
« no previous file with comments | « webkit/glue/webkit_glue.cc ('k') | webkit/glue/webkit_glue_common.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698