cc: Make separate interface for BeginFrame ipc from OutputSurface

content/browser/android/in_process/synchronous_compositor_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/input/layer_scroll_offset_delegate.h"
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "ipc/ipc_message.h"
 
 namespace cc {
+class BeginFrameSource;
 class InputHandler;
 }
 
 namespace blink {
 class WebInputEvent;
 }
 
 namespace content {
 class InputHandlerManager;
+class SynchronousCompositorExternalBeginFrameSource;
 struct DidOverscrollParams;
 
 // The purpose of this class is to act as the intermediary between the various
 // components that make up the 'synchronous compositor mode' implementation and
 // expose their functionality via the SynchronousCompositor interface.
 // This class is created on the main thread but most of the APIs are called
 // from the Compositor thread.
 class SynchronousCompositorImpl
     : public cc::LayerScrollOffsetDelegate,
       public SynchronousCompositor,
       public SynchronousCompositorOutputSurfaceDelegate,
       public WebContentsUserData<SynchronousCompositorImpl> {
  public:
   // When used from browser code, use both |process_id| and |routing_id|.
   static SynchronousCompositorImpl* FromID(int process_id, int routing_id);
   // When handling upcalls from renderer code, use this version; the process id
   // is implicitly that of the in-process renderer.
   static SynchronousCompositorImpl* FromRoutingID(int routing_id);
 
   InputEventAckState HandleInputEvent(const blink::WebInputEvent& input_event);
 
+  void SetExternalBeginFrameSource(

[boliu, 2014/10/24 17:42:41]

nit: Group methods called by FrameSource together, and add a comment

[simonhong, 2014/10/29 14:47:13]

Done.

+      SynchronousCompositorExternalBeginFrameSource* begin_frame_source);
+
+  void SetContinuousInvalidate(bool needs_begin_frames) const;
+
+  bool invoking_composite() const { return invoking_composite_; }
+
+  SynchronousCompositorOutputSurface* output_surface() const {

[boliu, 2014/10/24 17:42:41]

not used, remove

[simonhong, 2014/10/29 14:47:13]

Done.

+    return output_surface_;
+  }
+
   // SynchronousCompositor
   virtual void SetClient(SynchronousCompositorClient* compositor_client)
       override;
   virtual bool InitializeHwDraw() override;
   virtual void ReleaseHwDraw() override;
   virtual scoped_ptr<cc::CompositorFrame> DemandDrawHw(
       gfx::Size surface_size,
       const gfx::Transform& transform,
       gfx::Rect viewport,
       gfx::Rect clip,
       gfx::Rect viewport_rect_for_tile_priority,
       const gfx::Transform& transform_for_tile_priority) override;
   virtual bool DemandDrawSw(SkCanvas* canvas) override;
   virtual void ReturnResources(
       const cc::CompositorFrameAck& frame_ack) override;
   virtual void SetMemoryPolicy(
       const SynchronousCompositorMemoryPolicy& policy) override;
   virtual void DidChangeRootLayerScrollOffset() override;
 
   // SynchronousCompositorOutputSurfaceDelegate
   virtual void DidBindOutputSurface(
       SynchronousCompositorOutputSurface* output_surface) override;
   virtual void DidDestroySynchronousOutputSurface(
       SynchronousCompositorOutputSurface* output_surface) override;
-  virtual void SetContinuousInvalidate(bool enable) override;
   virtual void DidActivatePendingTree() override;
+  virtual void RequestBeginFrame() override;
 
   // LayerScrollOffsetDelegate
   virtual gfx::ScrollOffset GetTotalScrollOffset() override;
   virtual void UpdateRootLayerState(
       const gfx::ScrollOffset& total_scroll_offset,
       const gfx::ScrollOffset& max_scroll_offset,
       const gfx::SizeF& scrollable_size,
       float page_scale_factor,
       float min_page_scale_factor,
       float max_page_scale_factor) override;
   virtual bool IsExternalFlingActive() const override;
 
   void SetInputHandler(cc::InputHandler* input_handler);
   void DidOverscroll(const DidOverscrollParams& params);
   void DidStopFlinging();
 
  private:
   explicit SynchronousCompositorImpl(WebContents* contents);
   virtual ~SynchronousCompositorImpl();
   friend class WebContentsUserData<SynchronousCompositorImpl>;
 
   void UpdateFrameMetaData(const cc::CompositorFrameMetadata& frame_info);
   void DeliverMessages();
+  void BeginFrame() const;

[boliu, 2014/10/24 17:42:41]

Not called or defined. Remove

[simonhong, 2014/10/29 14:47:13]

Done.

   bool CalledOnValidThread() const;
 
   SynchronousCompositorClient* compositor_client_;
   SynchronousCompositorOutputSurface* output_surface_;
+  SynchronousCompositorExternalBeginFrameSource* begin_frame_source_;
   WebContents* contents_;
   cc::InputHandler* input_handler_;
+  bool invoking_composite_;
 
   base::WeakPtrFactory<SynchronousCompositorImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_IMPL_H_