[Remoting Android] DisplayUpdaterFactory cleanups

remoting/client/plugin/pepper_video_renderer_2d.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/plugin/pepper_video_renderer_2d.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 42 matching lines @@
 };
 
 }  // namespace
 
 PepperVideoRenderer2D::PepperVideoRenderer2D()
     : callback_factory_(this),
       weak_factory_(this) {}
 
 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_);
   DCHECK(instance);
   DCHECK(event_handler);
 
   instance_ = instance;
   event_handler_ = event_handler;
-  software_video_renderer_.reset(new SoftwareVideoRenderer(
-      context.decode_task_runner(), this, perf_tracker));
 
   return true;
 }
 
 void PepperVideoRenderer2D::OnViewChanged(const pp::View& view) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   pp::Rect pp_size = view.GetRect();
   view_size_ = webrtc::DesktopSize(pp_size.width(), pp_size.height());
 
   // Update scale if graphics2d has been initialized.
   if (!graphics2d_.is_null() && source_size_.width() > 0) {
     graphics2d_.SetScale(static_cast<float>(view_size_.width()) /
                          source_size_.width());
 
     // Bind graphics2d_ again after changing the scale to work around
     // crbug.com/521745 .
     instance_->BindGraphics(graphics2d_);
     bool result = instance_->BindGraphics(graphics2d_);
     DCHECK(result) << "Couldn't bind the device context.";
   }
 }
 
 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 Initialize() it can be created from
the PepperVideoRenderer2D constructor and it doesn't need to be allocated
separately on heap.

[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() here.

[Yuwei, 2016/06/28 21:43:03]

Done.

+  return true;
+}
+
 void PepperVideoRenderer2D::OnSessionConfig(
     const protocol::SessionConfig& config) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   software_video_renderer_->OnSessionConfig(config);
 }
 
 protocol::VideoStub* PepperVideoRenderer2D::GetVideoStub() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 93 matching lines @@
   flush_pending_ = false;
 
   // Call all callbacks for the frames we've just flushed.
   flushing_frames_done_callbacks_.clear();
 
   // Flush again if necessary.
   Flush();
 }
 
 }  // namespace remoting