| 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 e4ca7e4ade1acaefb01ef2afa74df021ac949934..fe7589b6472c3c340222c76d83bcb6cab71be5aa 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1072,8 +1072,8 @@ void LayerTreeHostImpl::SetNeedsRedrawRect(gfx::Rect damage_rect) {
|
| client_->SetNeedsRedrawRectOnImplThread(damage_rect);
|
| }
|
|
|
| -void LayerTreeHostImpl::BeginFrame(base::TimeTicks frame_time) {
|
| - client_->BeginFrameOnImplThread(frame_time);
|
| +void LayerTreeHostImpl::BeginFrame(const BeginFrameArgs& args) {
|
| + client_->BeginFrameOnImplThread(args);
|
| }
|
|
|
| void LayerTreeHostImpl::OnSwapBuffersComplete(
|
| @@ -1526,7 +1526,7 @@ bool LayerTreeHostImpl::DoInitializeRenderer(
|
| int max_frames_pending =
|
| output_surface->capabilities().max_frames_pending;
|
| if (max_frames_pending <= 0)
|
| - max_frames_pending = FrameRateController::DEFAULT_MAX_FRAMES_PENDING;
|
| + max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING;
|
| output_surface->SetMaxFramesPending(max_frames_pending);
|
|
|
| output_surface_ = output_surface.Pass();
|
|
|