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

Side by Side Diff: media/blink/webmediaplayer_params.cc

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix layout tests. Created 4 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "media/blink/webmediaplayer_params.h" 5 #include "media/blink/webmediaplayer_params.h"
6 6
7 #include "base/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
8 #include "base/task_runner.h" 8 #include "base/task_runner.h"
9 #include "media/base/audio_renderer_sink.h" 9 #include "media/base/audio_renderer_sink.h"
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 WebMediaPlayerParams::WebMediaPlayerParams( 14 WebMediaPlayerParams::WebMediaPlayerParams(
15 const DeferLoadCB& defer_load_cb, 15 const DeferLoadCB& defer_load_cb,
16 const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink, 16 const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink,
17 const scoped_refptr<MediaLog>& media_log, 17 const scoped_refptr<MediaLog>& media_log,
18 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 18 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
19 const scoped_refptr<base::TaskRunner>& worker_task_runner, 19 const scoped_refptr<base::TaskRunner>& worker_task_runner,
20 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 20 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
21 const Context3DCB& context_3d_cb, 21 const Context3DCB& context_3d_cb,
22 const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb, 22 const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb,
23 MediaPermission* media_permission,
24 blink::WebContentDecryptionModule* initial_cdm, 23 blink::WebContentDecryptionModule* initial_cdm,
25 SurfaceManager* surface_manager) 24 SurfaceManager* surface_manager)
26 : defer_load_cb_(defer_load_cb), 25 : defer_load_cb_(defer_load_cb),
27 audio_renderer_sink_(audio_renderer_sink), 26 audio_renderer_sink_(audio_renderer_sink),
28 media_log_(media_log), 27 media_log_(media_log),
29 media_task_runner_(media_task_runner), 28 media_task_runner_(media_task_runner),
30 worker_task_runner_(worker_task_runner), 29 worker_task_runner_(worker_task_runner),
31 compositor_task_runner_(compositor_task_runner), 30 compositor_task_runner_(compositor_task_runner),
32 context_3d_cb_(context_3d_cb), 31 context_3d_cb_(context_3d_cb),
33 adjust_allocated_memory_cb_(adjust_allocated_memory_cb), 32 adjust_allocated_memory_cb_(adjust_allocated_memory_cb),
34 media_permission_(media_permission),
35 initial_cdm_(initial_cdm), 33 initial_cdm_(initial_cdm),
36 surface_manager_(surface_manager) {} 34 surface_manager_(surface_manager) {}
37 35
38 WebMediaPlayerParams::~WebMediaPlayerParams() {} 36 WebMediaPlayerParams::~WebMediaPlayerParams() {}
39 37
40 } // namespace media 38 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698