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

Side by Side Diff: media/blink/BUILD.gn

Issue 2192823004: Update StreamTextureProxy to accept a base::Closure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments Created 4 years, 4 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
« no previous file with comments | « media/base/android/stream_texture_wrapper.h ('k') | media/blink/stream_texture_wrapper.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//media/media_options.gni") 5 import("//media/media_options.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 component("blink") { 8 component("blink") {
9 output_name = "media_blink" 9 output_name = "media_blink"
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 "websourcebuffer_impl.h", 85 "websourcebuffer_impl.h",
86 ] 86 ]
87 87
88 if (media_use_ffmpeg || !is_android) { 88 if (media_use_ffmpeg || !is_android) {
89 sources += [ 89 sources += [
90 "webmediaplayer_impl.cc", 90 "webmediaplayer_impl.cc",
91 "webmediaplayer_impl.h", 91 "webmediaplayer_impl.h",
92 ] 92 ]
93 if (is_android) { 93 if (is_android) {
94 sources += [ 94 sources += [
95 "stream_texture_wrapper.h",
96 "webmediaplayer_cast_android.cc", 95 "webmediaplayer_cast_android.cc",
97 "webmediaplayer_cast_android.h", 96 "webmediaplayer_cast_android.h",
98 ] 97 ]
99 deps += [ "//gpu/command_buffer/client:gles2_interface" ] 98 deps += [ "//gpu/command_buffer/client:gles2_interface" ]
100 } 99 }
101 } 100 }
102 } 101 }
103 102
104 test("media_blink_unittests") { 103 test("media_blink_unittests") {
105 deps = [ 104 deps = [
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 ] 151 ]
153 152
154 if (is_android) { 153 if (is_android) {
155 deps += [ 154 deps += [
156 "//media/base/android", 155 "//media/base/android",
157 "//media/base/android:media_java", 156 "//media/base/android:media_java",
158 "//v8:v8_external_startup_data_assets", 157 "//v8:v8_external_startup_data_assets",
159 ] 158 ]
160 } 159 }
161 } 160 }
OLDNEW
« no previous file with comments | « media/base/android/stream_texture_wrapper.h ('k') | media/blink/stream_texture_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698