Chromium Code Reviews| Index: remoting/client/plugin/pepper_video_renderer_2d.cc |
| diff --git a/remoting/client/plugin/pepper_video_renderer_2d.cc b/remoting/client/plugin/pepper_video_renderer_2d.cc |
| index 120b330a2926463f0eefbcf1f0e368c7f8fd4d1f..090e28a5f3c4f7e20ea47646b9ae796c6f289214 100644 |
| --- a/remoting/client/plugin/pepper_video_renderer_2d.cc |
| +++ b/remoting/client/plugin/pepper_video_renderer_2d.cc |
| @@ -60,11 +60,9 @@ PepperVideoRenderer2D::PepperVideoRenderer2D() |
| PepperVideoRenderer2D::~PepperVideoRenderer2D() {} |
| -bool PepperVideoRenderer2D::Initialize( |
| +bool PepperVideoRenderer2D::SetPepperContext( |
| pp::Instance* instance, |
| - const ClientContext& context, |
| - EventHandler* event_handler, |
| - protocol::PerformanceTracker* perf_tracker) { |
| + EventHandler* event_handler) { |
| DCHECK(thread_checker_.CalledOnValidThread()); |
| DCHECK(!instance_); |
| DCHECK(!event_handler_); |
| @@ -73,8 +71,6 @@ bool PepperVideoRenderer2D::Initialize( |
| instance_ = instance; |
| event_handler_ = event_handler; |
| - software_video_renderer_.reset(new SoftwareVideoRenderer( |
| - context.decode_task_runner(), this, perf_tracker)); |
| return true; |
| } |
| @@ -102,6 +98,17 @@ void PepperVideoRenderer2D::EnableDebugDirtyRegion(bool enable) { |
| debug_dirty_region_ = enable; |
| } |
| +bool PepperVideoRenderer2D::Initialize( |
| + const ClientContext& client_context, |
| + protocol::PerformanceTracker* perf_tracker) { |
| + DCHECK(thread_checker_.CalledOnValidThread()); |
| + |
| + software_video_renderer_.reset(new SoftwareVideoRenderer( |
|
Sergey Ulanov
2016/06/28 19:08:01
Since now SoftwareVideoRenderer() now has Initiali
Yuwei
2016/06/28 21:43:03
Done.
|
| + client_context.decode_task_runner(), this, perf_tracker)); |
| + |
|
Sergey Ulanov
2016/06/28 19:08:01
Need to call software_video_renderer_->Initialize(
Yuwei
2016/06/28 21:43:03
Done.
|
| + return true; |
| +} |
| + |
| void PepperVideoRenderer2D::OnSessionConfig( |
| const protocol::SessionConfig& config) { |
| DCHECK(thread_checker_.CalledOnValidThread()); |