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 22a50f0b4453f67211f0774ac538eeb644c20ffd..4ea1ad6b685bd2bb5ab4d6dc45bcea267bf7eb6a 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -31,7 +31,6 @@ |
#include "cc/quads/render_pass.h" |
#include "cc/resources/resource_provider.h" |
#include "cc/resources/tile_manager.h" |
-#include "cc/scheduler/begin_frame_source.h" |
#include "cc/scheduler/draw_result.h" |
#include "skia/ext/refptr.h" |
#include "third_party/skia/include/core/SkColor.h" |
@@ -112,7 +111,6 @@ class CC_EXPORT LayerTreeHostImpl |
public OutputSurfaceClient, |
public TopControlsManagerClient, |
public ScrollbarAnimationControllerClient, |
- public BeginFrameSourceMixIn, |
public base::SupportsWeakPtr<LayerTreeHostImpl> { |
public: |
static scoped_ptr<LayerTreeHostImpl> Create( |
@@ -124,9 +122,6 @@ class CC_EXPORT LayerTreeHostImpl |
int id); |
virtual ~LayerTreeHostImpl(); |
- // BeginFrameSourceMixIn implementation |
- virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) override; |
- |
// InputHandler implementation |
virtual void BindToClient(InputHandlerClient* client) override; |
virtual InputHandler::ScrollStatus ScrollBegin( |
@@ -254,7 +249,6 @@ class CC_EXPORT LayerTreeHostImpl |
virtual void CommitVSyncParameters(base::TimeTicks timebase, |
base::TimeDelta interval) override; |
virtual void SetNeedsRedrawRect(const gfx::Rect& rect) override; |
- virtual void BeginFrame(const BeginFrameArgs& args) override; |
virtual void SetExternalDrawConstraints( |
const gfx::Transform& transform, |
@@ -428,7 +422,9 @@ class CC_EXPORT LayerTreeHostImpl |
return begin_impl_frame_interval_; |
} |
- virtual void AsValueInto(base::debug::TracedValue* value) const override; |
+ void AsValueInto(base::debug::TracedValue* value) const { |
danakj
2014/10/10 16:03:35
keep the defn in the .cc
simonhong
2014/10/15 01:04:21
Done.
|
+ return AsValueWithFrameInto(NULL, value); |
+ } |
void AsValueWithFrameInto(FrameData* frame, |
base::debug::TracedValue* value) const; |
scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const; |