WIP: Surface Synchronization System

cc/surfaces/surface_factory.cc

 // Copyright 2014 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/surface_factory.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 46 matching lines @@
   TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame");
   DCHECK(local_frame_id.is_valid());
   std::unique_ptr<Surface> surface;
   bool create_new_surface =
       (!current_surface_ ||
        local_frame_id != current_surface_->surface_id().local_frame_id());
   if (!create_new_surface) {
     surface = std::move(current_surface_);
   } else {
     surface = Create(local_frame_id);
-    gfx::Size frame_size;
-    // CompositorFrames may not be populated with a RenderPass in unit tests.
-    if (!frame.render_pass_list.empty())
-      frame_size = frame.render_pass_list.back()->output_rect.size();
-    manager_->SurfaceCreated(SurfaceInfo(
-        surface->surface_id(), frame.metadata.device_scale_factor, frame_size));
   }
   surface->QueueFrame(std::move(frame), callback);
+
+  // Ask the surface manager to resolve the surface if it has a pending frame.
+  if (surface->GetPendingFrame().has_value())
+    manager_->RequestSurfaceResolution(surface.get());
+
   if (!manager_->SurfaceModified(SurfaceId(frame_sink_id_, local_frame_id))) {
     TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD);
     surface->RunDrawCallbacks();
   }
   if (current_surface_ && create_new_surface) {
     surface->SetPreviousFrameSurface(current_surface_.get());
     Destroy(std::move(current_surface_));
   }
   current_surface_ = std::move(surface);
 }
@@ skipping 27 matching lines @@
 }
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
   holder_.UnrefResources(resources);
 }
 
+void SurfaceFactory::OnSurfaceActivated(Surface* surface) {
+  gfx::Size frame_size;
+  // CompositorFrames may not be populated with a RenderPass in unit tests.
+  const CompositorFrame& frame = surface->GetEligibleFrame();
+  if (!frame.render_pass_list.empty())
+    frame_size = frame.render_pass_list.back()->output_rect.size();
+
+  manager_->SurfaceCreated(SurfaceInfo(
+      surface->surface_id(), frame.metadata.device_scale_factor, frame_size));
+  fprintf(stderr, ">>>SurfaceFactory::OnSurfaeActivated :%s\n",
+          surface->surface_id().ToString().c_str());
+  surface->RemoveObserver(this);
+}
+
+void SurfaceFactory::OnSurfaceChanged(
+    Surface* pending_surface,
+    const SurfaceDependencies& added_dependencies,
+    const SurfaceDependencies& removed_dependencies) {}
+
+void SurfaceFactory::OnSurfaceDiscarded(Surface* pending_surface) {}
+
 std::unique_ptr<Surface> SurfaceFactory::Create(
     const LocalFrameId& local_frame_id) {
   auto surface = base::MakeUnique<Surface>(
       SurfaceId(frame_sink_id_, local_frame_id), weak_factory_.GetWeakPtr());
   manager_->RegisterSurface(surface.get());
+  surface->AddObserver(this);
   return surface;
 }
 
 void SurfaceFactory::Destroy(std::unique_ptr<Surface> surface) {
+  surface->RemoveObserver(this);
   if (manager_)
     manager_->Destroy(std::move(surface));
 }
 
 }  // namespace cc