Index: cc/trees/layer_tree_host_impl.h |
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h |
index 03ddaa050d8288544f7fd87a59f981c484282061..fea883db2d58da9633da902267b3b8cbe3f1448c 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -32,6 +32,7 @@ |
#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" |
@@ -432,14 +433,15 @@ class CC_EXPORT LayerTreeHostImpl |
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 UpdateCurrentBeginFrameArg
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, |
@@ -529,6 +531,9 @@ class CC_EXPORT LayerTreeHostImpl |
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
mithro-old
2014/12/18 23:15:06
Done.
|
+ |
private: |
void CreateAndSetRenderer(); |
void CreateAndSetTileManager(); |
@@ -702,11 +707,6 @@ class CC_EXPORT LayerTreeHostImpl |
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_; |