Move context-related callbacks into OutputSurface

cc/layer_tree_host_impl.cc

Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index d3bbd6a08a7b549f734ed28cedb1e400d02d954a..c335b6f5814fc4675b603c05d84214c373a97cfd 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -765,6 +765,17 @@ void LayerTreeHostImpl::OnSendFrameToParentCompositorAck(const CompositorFrameAc
 
     // TODO(piman): We may need to do some validation on this ack before processing it.
     m_renderer->receiveCompositorFrameAck(ack);
+    OnSwapBuffersComplete();
+}
+
+void LayerTreeHostImpl::OnSwapBuffersComplete()
+{
+    m_client->onSwapBuffersCompleteOnImplThread();
+}
+
+void LayerTreeHostImpl::DidLoseOutputSurface()
+{
+    m_client->didLoseOutputSurfaceOnImplThread();
 }
 
 void LayerTreeHostImpl::OnCanDrawStateChangedForTree(LayerTreeImpl*)
@@ -879,16 +890,6 @@ const LayerTreeSettings& LayerTreeHostImpl::settings() const
     return m_settings;
 }
 
-void LayerTreeHostImpl::didLoseOutputSurface()
-{
-    m_client->didLoseOutputSurfaceOnImplThread();
-}
-
-void LayerTreeHostImpl::onSwapBuffersComplete()
-{
-    m_client->onSwapBuffersCompleteOnImplThread();
-}
-
 void LayerTreeHostImpl::readback(void* pixels, const gfx::Rect& rect)
 {
     DCHECK(m_renderer);