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

Side by Side Diff: webkit/compositor_bindings/compositor_bindings.gyp

Issue 11754003: Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gyp-depend-on-media+androidfix Created 7 years, 11 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
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 'variables': { 6 'variables': {
7 'webkit_compositor_bindings_sources': [ 7 'webkit_compositor_bindings_sources': [
8 'web_animation_curve_common.cc', 8 'web_animation_curve_common.cc',
9 'web_animation_curve_common.h', 9 'web_animation_curve_common.h',
10 'web_animation_id_provider.cc', 10 'web_animation_id_provider.cc',
(...skipping 15 matching lines...) Expand all
26 'web_image_layer_impl.cc', 26 'web_image_layer_impl.cc',
27 'web_image_layer_impl.h', 27 'web_image_layer_impl.h',
28 'web_layer_impl.cc', 28 'web_layer_impl.cc',
29 'web_layer_impl.h', 29 'web_layer_impl.h',
30 'web_nine_patch_layer_impl.cc', 30 'web_nine_patch_layer_impl.cc',
31 'web_nine_patch_layer_impl.h', 31 'web_nine_patch_layer_impl.h',
32 'web_to_ccinput_handler_adapter.cc', 32 'web_to_ccinput_handler_adapter.cc',
33 'web_to_ccinput_handler_adapter.h', 33 'web_to_ccinput_handler_adapter.h',
34 'web_to_ccscrollbar_theme_painter_adapter.cc', 34 'web_to_ccscrollbar_theme_painter_adapter.cc',
35 'web_to_ccscrollbar_theme_painter_adapter.h', 35 'web_to_ccscrollbar_theme_painter_adapter.h',
36 'web_to_ccvideo_frame_provider.cc',
37 'web_to_ccvideo_frame_provider.h',
36 'web_layer_tree_view_impl.cc', 38 'web_layer_tree_view_impl.cc',
37 'web_layer_tree_view_impl.h', 39 'web_layer_tree_view_impl.h',
38 'web_scrollbar_layer_impl.cc', 40 'web_scrollbar_layer_impl.cc',
39 'web_scrollbar_layer_impl.h', 41 'web_scrollbar_layer_impl.h',
40 'web_solid_color_layer_impl.cc', 42 'web_solid_color_layer_impl.cc',
41 'web_solid_color_layer_impl.h', 43 'web_solid_color_layer_impl.h',
42 'web_video_layer_impl.cc', 44 'web_video_layer_impl.cc',
43 'web_video_layer_impl.h', 45 'web_video_layer_impl.h',
44 'web_transform_animation_curve_impl.cc', 46 'web_transform_animation_curve_impl.cc',
45 'web_transform_animation_curve_impl.h', 47 'web_transform_animation_curve_impl.h',
46 ], 48 ],
47 'conditions': [ 49 'conditions': [
48 ['inside_chromium_build==0', { 50 ['inside_chromium_build==0', {
49 'webkit_src_dir': '../../../../..', 51 'webkit_src_dir': '../../../../..',
50 },{ 52 },{
51 'webkit_src_dir': '../../third_party/WebKit', 53 'webkit_src_dir': '../../third_party/WebKit',
52 }], 54 }],
53 ], 55 ],
54 }, 56 },
55 'targets': [ 57 'targets': [
56 { 58 {
57 'target_name': 'webkit_compositor_support', 59 'target_name': 'webkit_compositor_support',
58 'type': 'static_library', 60 'type': 'static_library',
59 'dependencies': [ 61 'dependencies': [
60 '../../skia/skia.gyp:skia', 62 '../../skia/skia.gyp:skia',
61 '../../cc/cc.gyp:cc', 63 '../../cc/cc.gyp:cc',
64 '../../media/media.gyp:media',
62 'webkit_compositor_bindings', 65 'webkit_compositor_bindings',
63 ], 66 ],
64 'sources': [ 67 'sources': [
65 'web_compositor_support_impl.cc', 68 'web_compositor_support_impl.cc',
66 'web_compositor_support_impl.h', 69 'web_compositor_support_impl.h',
67 ], 70 ],
68 'include_dirs': [ 71 'include_dirs': [
69 '../..', 72 '../..',
70 '<(SHARED_INTERMEDIATE_DIR)/webkit', 73 '<(SHARED_INTERMEDIATE_DIR)/webkit',
71 ], 74 ],
(...skipping 10 matching lines...) Expand all
82 ], 85 ],
83 'sources': [ 86 'sources': [
84 '<@(webkit_compositor_bindings_sources)', 87 '<@(webkit_compositor_bindings_sources)',
85 ], 88 ],
86 'defines': [ 89 'defines': [
87 'WEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' 90 'WEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1'
88 ] 91 ]
89 }, 92 },
90 ], 93 ],
91 } 94 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698