| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index b797c1c96963d761622d6a32b841d68ea1a25712..549b5ffb25f16a922a18b1098d8e36013d407e6f 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -203,8 +203,7 @@ LayerTreeHostImpl::LayerTreeHostImpl(
|
| SharedBitmapManager* shared_bitmap_manager,
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| int id)
|
| - : BeginFrameSourceMixIn(),
|
| - client_(client),
|
| + : client_(client),
|
| proxy_(proxy),
|
| use_gpu_rasterization_(false),
|
| input_handler_client_(NULL),
|
| @@ -1344,10 +1343,6 @@ void LayerTreeHostImpl::SetNeedsRedrawRect(const gfx::Rect& damage_rect) {
|
| client_->SetNeedsRedrawRectOnImplThread(damage_rect);
|
| }
|
|
|
| -void LayerTreeHostImpl::BeginFrame(const BeginFrameArgs& args) {
|
| - CallOnBeginFrame(args);
|
| -}
|
| -
|
| void LayerTreeHostImpl::DidSwapBuffers() {
|
| client_->DidSwapBuffersOnImplThread();
|
| }
|
| @@ -1586,13 +1581,6 @@ bool LayerTreeHostImpl::SwapBuffers(const LayerTreeHostImpl::FrameData& frame) {
|
| return true;
|
| }
|
|
|
| -void LayerTreeHostImpl::OnNeedsBeginFramesChange(bool enable) {
|
| - if (output_surface_)
|
| - output_surface_->SetNeedsBeginFrame(enable);
|
| - else
|
| - DCHECK(!enable);
|
| -}
|
| -
|
| void LayerTreeHostImpl::WillBeginImplFrame(const BeginFrameArgs& args) {
|
| // Sample the frame time now. This time will be used for updating animations
|
| // when we draw.
|
| @@ -3187,10 +3175,6 @@ BeginFrameArgs LayerTreeHostImpl::CurrentBeginFrameArgs() const {
|
| BeginFrameArgs::DefaultInterval());
|
| }
|
|
|
| -void LayerTreeHostImpl::AsValueInto(base::debug::TracedValue* value) const {
|
| - return AsValueWithFrameInto(NULL, value);
|
| -}
|
| -
|
| scoped_refptr<base::debug::ConvertableToTraceFormat>
|
| LayerTreeHostImpl::AsValue() const {
|
| return AsValueWithFrame(NULL);
|
| @@ -3204,6 +3188,10 @@ LayerTreeHostImpl::AsValueWithFrame(FrameData* frame) const {
|
| return state;
|
| }
|
|
|
| +void LayerTreeHostImpl::AsValueInto(base::debug::TracedValue* value) const {
|
| + return AsValueWithFrameInto(NULL, value);
|
| +}
|
| +
|
| void LayerTreeHostImpl::AsValueWithFrameInto(
|
| FrameData* frame,
|
| base::debug::TracedValue* state) const {
|
|
|