WIP: Surface Synchronization System

cc/surfaces/surface_manager.h

Index: cc/surfaces/surface_manager.h
diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
index ef6a73512a363292dee334deb02120c6aa0165a5..871b63ddbc7dc4416d488e41317d13598809f00e 100644
--- a/cc/surfaces/surface_manager.h
+++ b/cc/surfaces/surface_manager.h
@@ -19,6 +19,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
+#include "cc/surfaces/display_compositor_lock_manager.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_observer.h"
@@ -54,6 +55,12 @@ class CC_SURFACES_EXPORT SurfaceManager
   std::string SurfaceReferencesToString();
 #endif
 
+  void SetLockManager(
+      std::unique_ptr<DisplayCompositorLockManager> lock_manager);
+  DisplayCompositorLockManager* lock_manager() { return lock_manager_.get(); }
+
+  void RequestSurfaceResolution(Surface* pending_surface);
+
   void RegisterSurface(Surface* surface);
   void DeregisterSurface(const SurfaceId& surface_id);
 
@@ -242,6 +249,8 @@ class CC_SURFACES_EXPORT SurfaceManager
   std::unordered_map<FrameSinkId, std::vector<LocalFrameId>, FrameSinkIdHash>
       temp_references_;
 
+  std::unique_ptr<DisplayCompositorLockManager> lock_manager_;
+
   base::WeakPtrFactory<SurfaceManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);