Unified BeginFrame scheduling

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 e041aa08ceb7e8bdd09a4785f9fc59fcf181dce3..c7d3436071e352a758967c23953392107f65d6f5 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -31,8 +31,9 @@ namespace cc {
 
 class CompositorFrame;
 class CompositorFrameAck;
-struct ManagedMemoryPolicy;
 class OutputSurfaceClient;
+struct BeginFrameArgs;
+struct ManagedMemoryPolicy;
 
 // Represents the output surface for a compositor. The compositor owns
 // and manages its destruction. Its lifetime is:
@@ -126,7 +127,7 @@ class CC_EXPORT OutputSurface {
   // OutputSurfaceClient::BeginFrame until the callback is disabled.
   virtual void SetNeedsBeginFrame(bool enable) {}
 
-  bool HasClient() { return !!client_; }
+  bool HasClient() const { return !!client_; }
 
   // Returns an estimate of the current GPU latency. When only a software
   // device is present, returns 0.
@@ -137,6 +138,12 @@ class CC_EXPORT OutputSurface {
     return overlay_candidate_validator_.get();
   }
 
+  void BeginFrame(const BeginFrameArgs& args) const;
+
+  base::WeakPtr<OutputSurface> GetWeakPtr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  protected:
   OutputSurfaceClient* client_;