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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 16834004: move webkit/glue/worker_task_* to webkit/child/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « webkit/child/worker_task_runner_unittest.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 # Disable narrowing-conversion-in-initialization-list warnings in that we 7 # Disable narrowing-conversion-in-initialization-list warnings in that we
8 # do not want to fix it in data file "webcursor_gtk_data.h". 8 # do not want to fix it in data file "webcursor_gtk_data.h".
9 'cflags+': ['-Wno-narrowing'], 9 'cflags+': ['-Wno-narrowing'],
10 'cflags_cc+': ['-Wno-narrowing'], 10 'cflags_cc+': ['-Wno-narrowing'],
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 { 58 {
59 'target_name': 'glue_child', 59 'target_name': 'glue_child',
60 'type': '<(component)', 60 'type': '<(component)',
61 'variables': { 'enable_wexit_time_destructors': 1, }, 61 'variables': { 'enable_wexit_time_destructors': 1, },
62 'defines': [ 62 'defines': [
63 'WEBKIT_CHILD_IMPLEMENTATION', 63 'WEBKIT_CHILD_IMPLEMENTATION',
64 ], 64 ],
65 'dependencies': [ 65 'dependencies': [
66 '<(DEPTH)/base/base.gyp:base', 66 '<(DEPTH)/base/base.gyp:base',
67 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
67 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 68 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
68 '<(DEPTH)/ui/ui.gyp:ui', 69 '<(DEPTH)/ui/ui.gyp:ui',
69 70
70 # TODO(scottmg): crbug.com/237249 71 # TODO(scottmg): crbug.com/237249
71 'glue', 72 'glue',
72 ], 73 ],
73 74
74 'include_dirs': [ 75 'include_dirs': [
75 # For JNI generated header. 76 # For JNI generated header.
76 '<(SHARED_INTERMEDIATE_DIR)/webkit', 77 '<(SHARED_INTERMEDIATE_DIR)/webkit',
77 ], 78 ],
78 79
79 'sources': [ 80 'sources': [
80 '../child/fling_animator_impl_android.cc', 81 '../child/fling_animator_impl_android.cc',
81 '../child/fling_animator_impl_android.h', 82 '../child/fling_animator_impl_android.h',
82 '../child/fling_curve_configuration.cc', 83 '../child/fling_curve_configuration.cc',
83 '../child/fling_curve_configuration.h', 84 '../child/fling_curve_configuration.h',
84 '../child/touch_fling_gesture_curve.cc', 85 '../child/touch_fling_gesture_curve.cc',
85 '../child/touch_fling_gesture_curve.h', 86 '../child/touch_fling_gesture_curve.h',
86 '../child/webkit_child_export.h', 87 '../child/webkit_child_export.h',
87 '../child/webkitplatformsupport_child_impl.cc', 88 '../child/webkitplatformsupport_child_impl.cc',
88 '../child/webkitplatformsupport_child_impl.h', 89 '../child/webkitplatformsupport_child_impl.h',
90 '../child/worker_task_runner.cc',
91 '../child/worker_task_runner.h',
89 ], 92 ],
90 93
91 'conditions': [ 94 'conditions': [
92 ['OS=="android"', { 95 ['OS=="android"', {
93 'dependencies': [ 96 'dependencies': [
94 'overscroller_jni_headers', 97 'overscroller_jni_headers',
95 ], 98 ],
96 }], 99 }],
97 ], 100 ],
98 }, 101 },
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 'webthemeengine_impl_mac.cc', 286 'webthemeengine_impl_mac.cc',
284 'webthemeengine_impl_mac.h', 287 'webthemeengine_impl_mac.h',
285 'webthemeengine_impl_win.cc', 288 'webthemeengine_impl_win.cc',
286 'webthemeengine_impl_win.h', 289 'webthemeengine_impl_win.h',
287 'webthread_impl.h', 290 'webthread_impl.h',
288 'webthread_impl.cc', 291 'webthread_impl.cc',
289 'weburlloader_impl.cc', 292 'weburlloader_impl.cc',
290 'weburlloader_impl.h', 293 'weburlloader_impl.h',
291 'web_io_operators.cc', 294 'web_io_operators.cc',
292 'web_io_operators.h', 295 'web_io_operators.h',
293 'worker_task_runner.cc',
294 'worker_task_runner.h',
295 ], 296 ],
296 # When glue is a dependency, it needs to be a hard dependency. 297 # When glue is a dependency, it needs to be a hard dependency.
297 # Dependents may rely on files generated by this target or one of its 298 # Dependents may rely on files generated by this target or one of its
298 # own hard dependencies. 299 # own hard dependencies.
299 'hard_dependency': 1, 300 'hard_dependency': 1,
300 'conditions': [ 301 'conditions': [
301 ['use_default_render_theme==0', { 302 ['use_default_render_theme==0', {
302 'sources/': [ 303 'sources/': [
303 ['exclude', 'webthemeengine_impl_default.cc'], 304 ['exclude', 'webthemeengine_impl_default.cc'],
304 ['exclude', 'webthemeengine_impl_default.h'], 305 ['exclude', 'webthemeengine_impl_default.h'],
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 'variables': { 390 'variables': {
390 'jni_gen_package': 'webkit', 391 'jni_gen_package': 'webkit',
391 'input_java_class': 'android/widget/OverScroller.class', 392 'input_java_class': 'android/widget/OverScroller.class',
392 }, 393 },
393 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 394 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
394 }, 395 },
395 ], 396 ],
396 }], 397 }],
397 ], 398 ],
398 } 399 }
OLDNEW
« no previous file with comments | « webkit/child/worker_task_runner_unittest.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698