Move display_ From CompositorFrameSinkSupport To GpuDisplayCompositorFrameSink

cc/surfaces/compositor_frame_sink_support.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 "cc/surfaces/compositor_frame_sink_support.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/surfaces/surface_reference.h"
 
 namespace cc {
 
 CompositorFrameSinkSupport::CompositorFrameSinkSupport(
     CompositorFrameSinkSupportClient* client,
     SurfaceManager* surface_manager,
     const FrameSinkId& frame_sink_id,
-    Display* display,
     bool handles_frame_sink_id_invalidation,
-    bool needs_sync_points)
+    bool needs_sync_points,
+    bool has_display)

[danakj, 2017/02/08 19:23:38]

it seems a bit unmeaningful to call this has_display for this class, since it
doesn't use or know about a display. what does has_display mean? that it's the
root? something else? can you describe that in the name and maybe comments on
the defn?

[Alex Z., 2017/02/08 21:26:47]

Done.

     : client_(client),
       surface_manager_(surface_manager),
       frame_sink_id_(frame_sink_id),
-      display_(display),
       surface_factory_(frame_sink_id_, surface_manager_, this),
       handles_frame_sink_id_invalidation_(handles_frame_sink_id_invalidation),
       reference_tracker_(frame_sink_id),
+      has_display_(has_display),
       weak_factory_(this) {
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->RegisterFrameSinkId(frame_sink_id_);
 
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   surface_factory_.set_needs_sync_points(needs_sync_points);
-
-  if (display_)
-    display_->Initialize(this, surface_manager_);
 }
 
 CompositorFrameSinkSupport::~CompositorFrameSinkSupport() {
   // Unregister |this| as a BeginFrameObserver so that the BeginFrameSource does
   // not call into |this| after it's deleted.
   SetNeedsBeginFrame(false);
 
   // For display root surfaces, the surface is no longer going to be visible
   // so make it unreachable from the top-level root.
-  if (surface_manager_->using_surface_references() && display_ &&
+  if (surface_manager_->using_surface_references() && has_display_ &&
       reference_tracker_.current_surface_id().is_valid())
     RemoveTopLevelRootReference(reference_tracker_.current_surface_id());
 
   for (auto& child_frame_sink_id : child_frame_sinks_) {
     DCHECK(child_frame_sink_id.is_valid());
     surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
                                                    child_frame_sink_id);
   }
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
@@ skipping 10 matching lines @@
 
 void CompositorFrameSinkSupport::SetNeedsBeginFrame(bool needs_begin_frame) {
   needs_begin_frame_ = needs_begin_frame;
   UpdateNeedsBeginFramesInternal();
 }
 
 void CompositorFrameSinkSupport::SubmitCompositorFrame(
     const LocalSurfaceId& local_surface_id,
     CompositorFrame frame) {
   ++ack_pending_count_;
-  if (display_) {
-    display_->SetLocalSurfaceId(local_surface_id,
-                                frame.metadata.device_scale_factor);
-  }
-
   if (surface_manager_->using_surface_references()) {
     SurfaceId last_surface_id = reference_tracker_.current_surface_id();
 
     // Populate surface references to add/remove based on reference surfaces in
     // current frame compared with the last frame.
     reference_tracker_.UpdateReferences(local_surface_id,
                                         frame.metadata.referenced_surfaces);
 
     surface_factory_.SubmitCompositorFrame(
         local_surface_id, std::move(frame),
@@ skipping 18 matching lines @@
 void CompositorFrameSinkSupport::Satisfy(const SurfaceSequence& sequence) {
   surface_manager_->SatisfySequence(sequence);
 }
 
 void CompositorFrameSinkSupport::UpdateSurfaceReferences(
     const SurfaceId& last_surface_id,
     const LocalSurfaceId& local_surface_id) {
   const bool surface_id_changed =
       last_surface_id.local_surface_id() != local_surface_id;
 
   // If this is a display root surface and the SurfaceId is changing, make the

[xlai (Olivia), 2017/02/08 20:11:34]

Not sure if this comment about "display root surface" is still relevant after
the code change. Same question for other similar places in this class.

[Alex Z., 2017/02/08 21:26:47]

Yes, it's still relevant. Checking display_ is not null is equivalent to 
checking submits_to_display_compositor_ (has_display_) to be true.

   // new SurfaceId reachable from the top-level root.
-  if (display_ && surface_id_changed)
+  if (has_display_ && surface_id_changed)
     AddTopLevelRootReference(reference_tracker_.current_surface_id());
 
   // Add references based on CompositorFrame referenced surfaces. If the
   // SurfaceId has changed all referenced surfaces will be in this list.
   if (!reference_tracker_.references_to_add().empty()) {
     surface_manager_->AddSurfaceReferences(
         reference_tracker_.references_to_add());
   }
 
   // If this is a display root surface and the SurfaceId is changing, make the
   // old SurfaceId unreachable from the top-level root. This needs to happen
   // after adding all references for the new SurfaceId.
-  if (display_ && surface_id_changed && last_surface_id.is_valid())
+  if (has_display_ && surface_id_changed && last_surface_id.is_valid())
     RemoveTopLevelRootReference(last_surface_id);
 
   // Remove references based on CompositorFrame referenced surfaces. If the
   // SurfaceId has changed this list will be empty.
   if (!reference_tracker_.references_to_remove().empty()) {
     DCHECK(!surface_id_changed);
     surface_manager_->RemoveSurfaceReferences(
         reference_tracker_.references_to_remove());
   }
 }
@@ skipping 37 matching lines @@
   DCHECK(it->is_valid());
   surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
                                                  child_frame_sink_id);
   child_frame_sinks_.erase(it);
 }
 
 void CompositorFrameSinkSupport::ForceReclaimResources() {
   surface_factory_.ClearSurface();
 }
 
-void CompositorFrameSinkSupport::DisplayOutputSurfaceLost() {}
-
-void CompositorFrameSinkSupport::DisplayWillDrawAndSwap(
-    bool will_draw_and_swap,
-    const RenderPassList& render_passes) {}
-
-void CompositorFrameSinkSupport::DisplayDidDrawAndSwap() {}
-
 void CompositorFrameSinkSupport::ReturnResources(
     const ReturnedResourceArray& resources) {
   if (resources.empty())
     return;
 
   if (!ack_pending_count_ && client_) {
     client_->ReclaimResources(resources);
     return;
   }
 
@@ skipping 40 matching lines @@
     return;
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace cc