Unified OutputSurface::SwapBuffers.

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index fb93eb76dd2bb035b143ef4c4f6c0eb5ccbe7b47..57c2014000e718411b01898101f36c81ed67327b 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -46,11 +46,11 @@ class CC_EXPORT OutputSurface {
 
   struct Capabilities {
     Capabilities()
-        : has_parent_compositor(false),
+        : delegated_rendering(false),
           max_frames_pending(0),
           deferred_gl_initialization(false) {}
 
-    bool has_parent_compositor;
+    bool delegated_rendering;
     int max_frames_pending;
     bool deferred_gl_initialization;
   };
@@ -82,11 +82,6 @@ class CC_EXPORT OutputSurface {
   // thread.
   virtual bool BindToClient(OutputSurfaceClient* client);
 
-  // Sends frame data to the parent compositor. This should only be called when
-  // capabilities().has_parent_compositor. The implementation may destroy or
-  // steal the contents of the CompositorFrame passed in.
-  virtual void SendFrameToParentCompositor(CompositorFrame* frame);
-
   virtual void EnsureBackbuffer();
   virtual void DiscardBackbuffer();
 
@@ -95,8 +90,10 @@ class CC_EXPORT OutputSurface {
 
   virtual void BindFramebuffer();
 
-  virtual void PostSubBuffer(gfx::Rect rect, const ui::LatencyInfo&);
-  virtual void SwapBuffers(const ui::LatencyInfo&);
+  // The implementation may destroy or steal the contents of the CompositorFrame
+  // passed in (though it will not take ownership of the CompositorFrame
+  // itself).
+  virtual void SwapBuffers(CompositorFrame* frame);
 
   // Notifies frame-rate smoothness preference. If true, all non-critical
   // processing should be stopped, or lowered in priority.
@@ -122,6 +119,7 @@ class CC_EXPORT OutputSurface {
   scoped_ptr<WebKit::WebGraphicsContext3D> context3d_;
   scoped_ptr<cc::SoftwareOutputDevice> software_device_;
   bool has_gl_discard_backbuffer_;
+  bool has_swap_buffers_complete_callback_;
   gfx::Size surface_size_;
   float device_scale_factor_;