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

Side by Side Diff: webkit/media/webkit_media.gypi

Issue 12676004: Move ownership of cc:VideoLayer to webkit/media (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/media/android/webmediaplayer_android.cc ('k') | webkit/media/webmediaplayer_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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 21 matching lines...) Expand all
32 '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc. 32 '<(SHARED_INTERMEDIATE_DIR)', # Needed by key_systems.cc.
33 ], 33 ],
34 'dependencies': [ 34 'dependencies': [
35 '<(DEPTH)/base/base.gyp:base', 35 '<(DEPTH)/base/base.gyp:base',
36 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 36 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
37 '<(DEPTH)/media/media.gyp:media', 37 '<(DEPTH)/media/media.gyp:media',
38 '<(DEPTH)/media/media.gyp:shared_memory_support', 38 '<(DEPTH)/media/media.gyp:shared_memory_support',
39 '<(DEPTH)/media/media.gyp:yuv_convert', 39 '<(DEPTH)/media/media.gyp:yuv_convert',
40 '<(DEPTH)/skia/skia.gyp:skia', 40 '<(DEPTH)/skia/skia.gyp:skia',
41 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version _h', 41 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version _h',
42 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_bindings',
42 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 43 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
43 ], 44 ],
44 'sources': [ 45 'sources': [
45 'android/audio_decoder_android.cc', 46 'android/audio_decoder_android.cc',
46 'android/media_player_bridge_manager_impl.cc', 47 'android/media_player_bridge_manager_impl.cc',
47 'android/media_player_bridge_manager_impl.h', 48 'android/media_player_bridge_manager_impl.h',
48 'android/stream_texture_factory_android.h', 49 'android/stream_texture_factory_android.h',
49 'android/webmediaplayer_android.cc', 50 'android/webmediaplayer_android.cc',
50 'android/webmediaplayer_android.h', 51 'android/webmediaplayer_android.h',
51 'android/webmediaplayer_impl_android.cc', 52 'android/webmediaplayer_impl_android.cc',
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 245 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
245 '<(PRODUCT_DIR)/ffmpegsumo.so' 246 '<(PRODUCT_DIR)/ffmpegsumo.so'
246 ] 247 ]
247 } 248 }
248 ] 249 ]
249 }], 250 }],
250 ], 251 ],
251 } 252 }
252 ], 253 ],
253 } 254 }
OLDNEW
« no previous file with comments | « webkit/media/android/webmediaplayer_android.cc ('k') | webkit/media/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698