cc: Adding BeginFrameTracker object and removing Now() from LTHI.

cc/trees/layer_tree_host_impl.h

 // Copyright 2011 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_TREES_LAYER_TREE_HOST_IMPL_H_
 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
 
 #include <list>
 #include <set>
 #include <string>
@@ skipping 14 matching lines @@
 #include "cc/input/top_controls_manager_client.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/layers/render_pass_sink.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/tile_manager.h"
+#include "cc/scheduler/begin_frame_tracker.h"
 #include "cc/scheduler/commit_earlyout_reason.h"
 #include "cc/scheduler/draw_result.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
 class CompletionEvent;
 class CompositorFrameMetadata;
@@ skipping 380 matching lines @@
 
   gfx::Vector2dF accumulated_root_overscroll() const {
     return accumulated_root_overscroll_;
   }
 
   bool pinch_gesture_active() const { return pinch_gesture_active_; }
 
   void SetTreePriority(TreePriority priority);
   TreePriority GetTreePriority() const;
 
+  // TODO(mithro): Remove these methods which expose control of the internal

[brianderson, 2014/12/18 21:57:08]

Can you at least remove UpdateCurrentBeginFrameArgs?

[mithro-old, 2014/12/18 23:15:06]

Done.

+  // BeginFrameArgs to external callers. LayerTreeHostImpl should manage its
+  // own frame time based on WillBeginImplFrame and other methods.
   void UpdateCurrentBeginFrameArgs(const BeginFrameArgs& args);
   void ResetCurrentBeginFrameArgsForNextFrame();
   virtual BeginFrameArgs CurrentBeginFrameArgs() const;
 
   // Expected time between two begin impl frame calls.
-  base::TimeDelta begin_impl_frame_interval() const {
-    return begin_impl_frame_interval_;
-  }
+  base::TimeDelta CurrentBeginFrameInterval() const;
 
   void AsValueInto(base::debug::TracedValue* value) const;
   void AsValueWithFrameInto(FrameData* frame,
                             base::debug::TracedValue* value) const;
   scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
   scoped_refptr<base::debug::ConvertableToTraceFormat> AsValueWithFrame(
       FrameData* frame) const;
   scoped_refptr<base::debug::ConvertableToTraceFormat> ActivationStateAsValue()
       const;
   void ActivationStateAsValueInto(base::debug::TracedValue* value) const;
@@ skipping 69 matching lines @@
   const AnimationRegistrar::AnimationControllerMap&
       active_animation_controllers() const {
     return animation_registrar_->active_animation_controllers();
   }
 
   bool prepare_tiles_needed() const { return tile_priorities_dirty_; }
 
   LayerTreeHostImplClient* client_;
   Proxy* proxy_;
 
+  BeginFrameTracker current_begin_frame_args_ =
+      BeginFrameTracker(BEGINFRAMETRACKER_FROM_HERE);

[brianderson, 2014/12/18 21:57:08]

According to http://chromium-cpp.appspot.com this isn't allowed yet.

[mithro-old, 2014/12/18 23:15:06]

Done.

+
  private:
   void CreateAndSetRenderer();
   void CreateAndSetTileManager();
   void DestroyTileManager();
   void ReleaseTreeResources();
   void EnforceZeroBudget(bool zero_budget);
 
   bool UsePendingTreeForSync() const;
   bool IsSynchronousSingleThreaded() const;
 
@@ skipping 153 matching lines @@
   // - viewport_rect_for_tile_priority_ is the rect in view space used for
   // tiling priority.
   gfx::Transform external_transform_;
   gfx::Rect external_viewport_;
   gfx::Rect external_clip_;
   gfx::Rect viewport_rect_for_tile_priority_;
   bool resourceless_software_draw_;
 
   gfx::Rect viewport_damage_rect_;
 
-  BeginFrameArgs current_begin_frame_args_;
-
-  // Expected time between two begin impl frame calls.
-  base::TimeDelta begin_impl_frame_interval_;
-
   scoped_ptr<AnimationRegistrar> animation_registrar_;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
   MicroBenchmarkControllerImpl micro_benchmark_controller_;
   scoped_ptr<TaskGraphRunner> single_thread_synchronous_task_graph_runner_;
 
   // Optional callback to notify of new tree activations.
   base::Closure tree_activation_callback_;
 
   SharedBitmapManager* shared_bitmap_manager_;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   int id_;
 
   std::set<SwapPromiseMonitor*> swap_promise_monitor_;
 
   std::vector<PictureLayerImpl*> picture_layers_;
   std::vector<PictureLayerImpl::Pair> picture_layer_pairs_;
 
   bool requires_high_res_to_draw_;
   bool required_for_draw_tile_is_top_of_raster_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_IMPL_H_