WIP: Surface Synchronization System

cc/surfaces/surface_manager.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_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
@@ skipping 62 matching lines @@
 }
 
 #if DCHECK_IS_ON()
 std::string SurfaceManager::SurfaceReferencesToString() {
   std::stringstream str;
   SurfaceReferencesToStringImpl(root_surface_id_, "", &str);
   return str.str();
 }
 #endif
 
+void SurfaceManager::SetLockManager(
+    std::unique_ptr<DisplayCompositorLockManager> lock_manager) {
+  lock_manager_ = std::move(lock_manager);
+}
+
+void SurfaceManager::RequestSurfaceResolution(Surface* pending_surface) {
+  if (lock_manager_)
+    lock_manager_->RequestSurfaceResolution(pending_surface);
+}
+
 void SurfaceManager::RegisterSurface(Surface* surface) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(surface);
   DCHECK(!surface_map_.count(surface->surface_id()));
   surface_map_[surface->surface_id()] = surface;
 }
 
 void SurfaceManager::DeregisterSurface(const SurfaceId& surface_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SurfaceMap::iterator it = surface_map_.find(surface_id);
@@ skipping 48 matching lines @@
   // Check some conditions that should never happen. We don't want to crash on
   // bad input from a compromised client so just return early.
   if (parent_id == child_id) {
     DLOG(ERROR) << "Cannot add self reference for " << parent_id.ToString();
     return;
   }
   if (parent_id != root_surface_id_ && surface_map_.count(parent_id) == 0) {
     DLOG(ERROR) << "No surface in map for " << parent_id.ToString();
     return;
   }
-  if (surface_map_.count(child_id) == 0) {
-    DLOG(ERROR) << "No surface in map for " << child_id.ToString();
-    return;
-  }
+  // if (surface_map_.count(child_id) == 0) {
+  //  DLOG(ERROR) << "No surface in map for " << child_id.ToString();
+  //  return;
+  //}
 
   // There could be a temporary reference to |child_id| which we should now
   // remove because a real reference is being added to it. To find out whether
   // or not a temporary reference exists, we need to first look up the
   // FrameSinkId of |child_id| in |temp_references_|, which returns a vector of
   // LocalFrameIds, and then search for the LocalFrameId of |child_id| in the
   // said vector. If there is no temporary reference, we can immediately add the
   // reference from |parent_id| and return.
   auto refs_iter = temp_references_.find(child_id.frame_sink_id());
   if (refs_iter == temp_references_.end()) {
@@ skipping 461 matching lines @@
     std::vector<SurfaceId> children(iter->second.begin(), iter->second.end());
     std::sort(children.begin(), children.end());
 
     for (const SurfaceId& child_id : children)
       SurfaceReferencesToStringImpl(child_id, indent + "  ", str);
   }
 }
 #endif  // DCHECK_IS_ON()
 
 }  // namespace cc