Chromium Code Reviews| Index: cc/trees/layer_tree_host.cc |
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
| index 6f995d8ca634a3548bb4b460896fd6dc2d806d69..6e07a0189624c0ecd376094621fb7da0d807d6d2 100644 |
| --- a/cc/trees/layer_tree_host.cc |
| +++ b/cc/trees/layer_tree_host.cc |
| @@ -383,8 +383,12 @@ void LayerTreeHost::CommitComplete() { |
| client_->DidCommit(); |
| } |
| -scoped_ptr<OutputSurface> LayerTreeHost::CreateOutputSurface() { |
| - return client_->CreateOutputSurface(num_failed_recreate_attempts_ >= 4); |
| +void LayerTreeHost::SetOutputSurface(scoped_ptr<OutputSurface> surface) { |
| + proxy_->SetOutputSurface(surface.Pass()); |
| +} |
| + |
| +void LayerTreeHost::RequestNewOutputSurface() { |
| + client_->RequestNewOutputSurface(num_failed_recreate_attempts_ >= 4); |
| } |
| scoped_ptr<LayerTreeHostImpl> LayerTreeHost::CreateLayerTreeHostImpl( |
| @@ -678,9 +682,8 @@ void LayerTreeHost::Composite(base::TimeTicks frame_begin_time) { |
| SingleThreadProxy* proxy = static_cast<SingleThreadProxy*>(proxy_.get()); |
| SetLayerTreeHostClientReady(); |
| - |
| if (output_surface_lost_) |
| - proxy->CreateAndInitializeOutputSurface(); |
| + RequestNewOutputSurface(); |
| if (output_surface_lost_) |
|
no sievers
2014/06/23 19:53:58
nit: combine if-clauses
enne (OOO)
2014/06/24 22:20:06
Done.
|
| return; |