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 42498c8451e12594d0d8e377cacfefd9456b9b06..918b9493c26aea15ef76fd6e39a0f3c60c543f3c 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -30,8 +30,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:
@@ -125,13 +126,19 @@ 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_; }
 
   // Get the class capable of informing cc of hardware overlay capability.
   OverlayCandidateValidator* overlay_candidate_validator() const {
     return overlay_candidate_validator_.get();
   }
 
+  void BeginFrame(const BeginFrameArgs& args) const;
+
+  base::WeakPtr<OutputSurface> GetWeakPtr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  protected:
   OutputSurfaceClient* client_;