| 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 affd0ea1370501726884bd65d8ad5a134704a273..4d55175278f4ef4d691049b41188be392ef974d9 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -33,6 +33,7 @@
|
| #include "cc/resources/resource_provider.h"
|
| #include "cc/resources/tile_manager.h"
|
| #include "cc/resources/ui_resource_client.h"
|
| +#include "cc/scheduler/begin_frame_tracker.h"
|
| #include "cc/scheduler/commit_earlyout_reason.h"
|
| #include "cc/scheduler/draw_result.h"
|
| #include "cc/scheduler/video_frame_controller.h"
|
| @@ -443,12 +444,12 @@ class CC_EXPORT LayerTreeHostImpl
|
| void SetTreePriority(TreePriority priority);
|
| TreePriority GetTreePriority() const;
|
|
|
| + // TODO(mithro): Remove this methods which exposes the internal
|
| + // BeginFrameArgs to external callers.
|
| 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 AsValueWithFrameInto(FrameData* frame,
|
| base::trace_event::TracedValue* value) const;
|
| @@ -557,6 +558,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| LayerTreeHostImplClient* client_;
|
| Proxy* proxy_;
|
|
|
| + BeginFrameTracker current_begin_frame_tracker_;
|
| +
|
| private:
|
| gfx::Vector2dF ScrollLayerWithViewportSpaceDelta(
|
| LayerImpl* layer_impl,
|
| @@ -726,11 +729,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_;
|
| std::set<ScrollbarAnimationController*> scrollbar_animation_controllers_;
|
| std::set<VideoFrameController*> video_frame_controllers_;
|
|
|