cc: Add SwapPromiseManager and SurfaceSequenceGenerator.

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 9a797721a07ba2d7258d75accc8c7ac2dcd0dac1..b32ed3299d1fb91303ce3897234fd83da379aea3 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -41,6 +41,8 @@
 #include "cc/trees/latency_info_swap_promise_monitor.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/remote_proto_channel.h"
+#include "cc/trees/surface_sequence_generator.h"
+#include "cc/trees/swap_promise_manager.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/layer_tree_settings_factory.h"
@@ -627,13 +629,14 @@ std::unique_ptr<cc::SwapPromiseMonitor>
 RenderWidgetCompositor::CreateLatencyInfoSwapPromiseMonitor(
     ui::LatencyInfo* latency) {
   return std::unique_ptr<cc::SwapPromiseMonitor>(

[vmpstr, 2016/09/12 20:44:31]

does base::MakeUnique<cc::LatencyInfoSwapPromiseMonitor> work here?

[Khushal, 2016/09/12 22:53:03]

Done.

-      new cc::LatencyInfoSwapPromiseMonitor(latency, layer_tree_host_.get(),
-                                            NULL));
+      new cc::LatencyInfoSwapPromiseMonitor(
+          latency, layer_tree_host_->GetSwapPromiseManager(), NULL));
 }
 
 void RenderWidgetCompositor::QueueSwapPromise(
     std::unique_ptr<cc::SwapPromise> swap_promise) {
-  layer_tree_host_->QueueSwapPromise(std::move(swap_promise));
+  layer_tree_host_->GetSwapPromiseManager()->QueueSwapPromise(

[piman, 2016/09/12 20:35:44]

I have a mild preference to keeping a QueueSwapPromise and SetSurfaceClientId
APIs on LTH, that would forward to their individual tear-off. 2 reasons:
1- They both seem like legitimate operations one would do on LTH
2- Law of Demeter. The fact that those go to tear-off classes is an
implementation detail of LTH, and the client shouldn't have to know. It also
increases coupling.

[Khushal, 2016/09/12 22:53:03]

Done. Retained those 2 APIs.

+      std::move(swap_promise));
 }
 
 int RenderWidgetCompositor::GetSourceFrameNumber() const {
@@ -932,7 +935,7 @@ void RenderWidgetCompositor::compositeAndReadbackAsync(
                                              callback, base::Passed(&result)));
           },
           callback, base::Passed(&main_thread_task_runner)));
-  layer_tree_host_->QueueSwapPromise(
+  layer_tree_host_->GetSwapPromiseManager()->QueueSwapPromise(
       delegate_->RequestCopyOfOutputForLayoutTest(std::move(request)));
 
   // Force a commit to happen. The temporary copy output request will
@@ -1126,7 +1129,8 @@ void RenderWidgetCompositor::SendCompositorProto(
 }
 
 void RenderWidgetCompositor::SetSurfaceClientId(uint32_t surface_client_id) {
-  layer_tree_host_->SetSurfaceClientId(surface_client_id);
+  layer_tree_host_->GetSurfaceSequenceGenerator()->set_surface_client_id(
+      surface_client_id);
 }
 
 void RenderWidgetCompositor::OnHandleCompositorProto(