cc: Handle retroactive BeginFrames in the Scheduler.

cc/output/output_surface.h

 // Copyright 2012 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 CC_OUTPUT_OUTPUT_SURFACE_H_
 #define CC_OUTPUT_OUTPUT_SURFACE_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
@@ skipping 51 matching lines @@
         : delegated_rendering(false),
           max_frames_pending(0),
           deferred_gl_initialization(false),
           draw_and_swap_full_viewport_every_frame(false),
           adjust_deadline_for_parent(true),
           uses_default_gl_framebuffer(true) {}
     bool delegated_rendering;
     int max_frames_pending;
     bool deferred_gl_initialization;
     bool draw_and_swap_full_viewport_every_frame;
-    // This doesn't handle the <webview> case, but once BeginImplFrame is
+    // This doesn't handle the <webview> case, but once BeginFrame is
     // supported natively, we shouldn't need adjust_deadline_for_parent.
     bool adjust_deadline_for_parent;
     // Whether this output surface renders to the default OpenGL zero
     // framebuffer or to an offscreen framebuffer.
     bool uses_default_gl_framebuffer;
   };
 
   const Capabilities& capabilities() const {
     return capabilities_;
   }
@@ skipping 15 matching lines @@
   // (namely Android WebView), this is called to determine whether the software
   // device should be used on the current frame.
   virtual bool ForcedDrawToSoftwareDevice() const;
 
   // Called by the compositor on the compositor thread. This is a place where
   // thread-specific data for the output surface can be initialized, since from
   // this point on the output surface will only be used on the compositor
   // thread.
   virtual bool BindToClient(OutputSurfaceClient* client);
 
-  void InitializeBeginImplFrameEmulation(
-      base::SingleThreadTaskRunner* task_runner,
-      bool throttle_frame_production,
-      base::TimeDelta interval);
+  void InitializeBeginFrameEmulation(base::SingleThreadTaskRunner* task_runner,
+                                     bool throttle_frame_production,
+                                     base::TimeDelta interval);
 
   void SetMaxFramesPending(int max_frames_pending);
 
   virtual void EnsureBackbuffer();
   virtual void DiscardBackbuffer();
 
   virtual void Reshape(const gfx::Size& size, float scale_factor);
   virtual gfx::Size SurfaceSize() const;
 
   virtual void BindFramebuffer();
 
   // 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.
   virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) {}
 
-  // Requests a BeginImplFrame notification from the output surface. The
+  // Requests a BeginFrame notification from the output surface. The
   // notification will be delivered by calling
-  // OutputSurfaceClient::BeginImplFrame until the callback is disabled.
-  virtual void SetNeedsBeginImplFrame(bool enable);
+  // OutputSurfaceClient::BeginFrame until the callback is disabled.
+  virtual void SetNeedsBeginFrame(bool enable);
 
   bool HasClient() { return !!client_; }
 
   // Returns an estimate of the current GPU latency. When only a software
   // device is present, returns 0.
   base::TimeDelta GpuLatencyEstimate();
 
   // Get the class capable of informing cc of hardware overlay capability.
   OverlayCandidateValidator* overlay_candidate_validator() const {
     return overlay_candidate_validator_.get();
@@ skipping 12 matching lines @@
   void PostSwapBuffersComplete();
 
   struct OutputSurface::Capabilities capabilities_;
   scoped_refptr<ContextProvider> context_provider_;
   scoped_ptr<SoftwareOutputDevice> software_device_;
   scoped_ptr<OverlayCandidateValidator> overlay_candidate_validator_;
   gfx::Size surface_size_;
   float device_scale_factor_;
 
   // The FrameRateController is deprecated.
-  // Platforms should move to native BeginImplFrames instead.
+  // Platforms should move to native BeginFrames instead.
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval);
   virtual void FrameRateControllerTick(bool throttled,
                                        const BeginFrameArgs& args) OVERRIDE;
   scoped_ptr<FrameRateController> frame_rate_controller_;
   int max_frames_pending_;
   int pending_swap_buffers_;
   bool needs_begin_impl_frame_;
-  bool client_ready_for_begin_impl_frame_;
 
-  // This stores a BeginImplFrame that we couldn't process immediately,
+  // This stores a BeginFrame that we couldn't process immediately,
   // but might process retroactively in the near future.
   BeginFrameArgs skipped_begin_impl_frame_args_;

[Sami, 2014/04/01 13:09:10]

skipped_begin_frame_args_?

 
   // Forwarded to OutputSurfaceClient but threaded through OutputSurface
   // first so OutputSurface has a chance to update the FrameRateController
   void SetNeedsRedrawRect(const gfx::Rect& damage_rect);
-  void BeginImplFrame(const BeginFrameArgs& args);
+  void BeginFrame(const BeginFrameArgs& args);
   void DidSwapBuffers();
   void OnSwapBuffersComplete();
   void ReclaimResources(const CompositorFrameAck* ack);
   void DidLoseOutputSurface();
   void SetExternalStencilTest(bool enabled);
   void SetExternalDrawConstraints(const gfx::Transform& transform,
                                   const gfx::Rect& viewport,
                                   const gfx::Rect& clip,
                                   bool valid_for_tile_management);
 
   // virtual for testing.
-  virtual base::TimeTicks RetroactiveBeginImplFrameDeadline();
-  virtual void PostCheckForRetroactiveBeginImplFrame();
-  void CheckForRetroactiveBeginImplFrame();
+  virtual base::TimeTicks RetroactiveBeginFrameDeadline();
+  virtual void PostCheckForRetroactiveBeginFrame();
+  void CheckForRetroactiveBeginFrame();
 
  private:
   OutputSurfaceClient* client_;
 
   void SetUpContext3d();
   void ResetContext3d();
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
   void UpdateAndMeasureGpuLatency();
 
   // check_for_retroactive_begin_impl_frame_pending_ is used to avoid posting
-  // redundant checks for a retroactive BeginImplFrame.
+  // redundant checks for a retroactive BeginFrame.
   bool check_for_retroactive_begin_impl_frame_pending_;
 
   bool external_stencil_test_enabled_;
 
   base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
 
   std::deque<unsigned> available_gpu_latency_query_ids_;
   std::deque<unsigned> pending_gpu_latency_query_ids_;
   RollingTimeDeltaHistory gpu_latency_history_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_OUTPUT_SURFACE_H_