Move Work From CompositorFrameSinkSupport() To Init()

ash/laser/laser_pointer_view.cc

 // Copyright 2016 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 "ash/laser/laser_pointer_view.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 193 matching lines @@
 // LaserPointerView
 LaserPointerView::LaserPointerView(base::TimeDelta life_duration,
                                    base::TimeDelta presentation_delay,
                                    aura::Window* root_window)
     : laser_points_(life_duration),
       predicted_laser_points_(life_duration),
       presentation_delay_(presentation_delay),
       frame_sink_id_(aura::Env::GetInstance()
                          ->context_factory_private()
                          ->AllocateFrameSinkId()),
-      frame_sink_support_(this,
-                          aura::Env::GetInstance()
-                              ->context_factory_private()
-                              ->GetSurfaceManager(),
-                          frame_sink_id_,
-                          false /* is_root */,
-                          true /* handles_frame_sink_id_invalidation */,
-                          true /* needs_sync_points */),
+      frame_sink_support_(cc::CompositorFrameSinkSupport::Create(
+          this,
+          aura::Env::GetInstance()
+              ->context_factory_private()
+              ->GetSurfaceManager(),
+          frame_sink_id_,
+          false /* is_root */,
+          true /* handles_frame_sink_id_invalidation */,
+          true /* needs_sync_points */)),
       weak_ptr_factory_(this) {
   widget_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.name = "LaserOverlay";
   params.accept_events = false;
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.parent =
@@ skipping 139 matching lines @@
   // fading away.
   base::TimeTicks next_presentation_time =
       ui::EventTimeForNow() + presentation_delay_;
   laser_points_.MoveForwardToTime(next_presentation_time);
   predicted_laser_points_.MoveForwardToTime(next_presentation_time);
   buffer_damage_rect_.Union(GetBoundingBox());
   OnPointsUpdated();
 }
 
 void LaserPointerView::SetNeedsBeginFrame(bool needs_begin_frame) {
-  frame_sink_support_.SetNeedsBeginFrame(needs_begin_frame);
+  frame_sink_support_->SetNeedsBeginFrame(needs_begin_frame);
 }
 
 void LaserPointerView::SubmitCompositorFrame(
     const cc::LocalSurfaceId& local_surface_id,
     cc::CompositorFrame frame) {
-  frame_sink_support_.SubmitCompositorFrame(local_surface_id, std::move(frame));
+  frame_sink_support_->SubmitCompositorFrame(local_surface_id,
+                                             std::move(frame));
 }
 
 void LaserPointerView::BeginFrameDidNotSwap(
     const cc::BeginFrameAck& begin_frame_ack) {
-  frame_sink_support_.BeginFrameDidNotSwap(begin_frame_ack);
+  frame_sink_support_->BeginFrameDidNotSwap(begin_frame_ack);
 }
 
 void LaserPointerView::EvictFrame() {
-  frame_sink_support_.EvictFrame();
+  frame_sink_support_->EvictFrame();
 }
 
 void LaserPointerView::DidReceiveCompositorFrameAck() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&LaserPointerView::OnDidDrawSurface,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 void LaserPointerView::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
@@ skipping 313 matching lines @@
   pending_draw_surface_ = true;
 }
 
 void LaserPointerView::OnDidDrawSurface() {
   pending_draw_surface_ = false;
   if (needs_update_surface_)
     UpdateSurface();
 }
 
 }  // namespace ash