| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 2046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2057 resource_provider_.reset(); | 2057 resource_provider_.reset(); |
| 2058 output_surface_.reset(); | 2058 output_surface_.reset(); |
| 2059 | 2059 |
| 2060 if (!output_surface->BindToClient(this)) | 2060 if (!output_surface->BindToClient(this)) |
| 2061 return false; | 2061 return false; |
| 2062 | 2062 |
| 2063 output_surface_ = output_surface.Pass(); | 2063 output_surface_ = output_surface.Pass(); |
| 2064 resource_provider_ = | 2064 resource_provider_ = |
| 2065 ResourceProvider::Create(output_surface_.get(), | 2065 ResourceProvider::Create(output_surface_.get(), |
| 2066 shared_bitmap_manager_, | 2066 shared_bitmap_manager_, |
| 2067 proxy_->blocking_main_thread_task_runner(), |
| 2067 settings_.highp_threshold_min, | 2068 settings_.highp_threshold_min, |
| 2068 settings_.use_rgba_4444_textures, | 2069 settings_.use_rgba_4444_textures, |
| 2069 settings_.texture_id_allocation_chunk_size, | 2070 settings_.texture_id_allocation_chunk_size, |
| 2070 settings_.use_distance_field_text); | 2071 settings_.use_distance_field_text); |
| 2071 | 2072 |
| 2072 if (output_surface_->capabilities().deferred_gl_initialization) | 2073 if (output_surface_->capabilities().deferred_gl_initialization) |
| 2073 EnforceZeroBudget(true); | 2074 EnforceZeroBudget(true); |
| 2074 | 2075 |
| 2075 CreateAndSetRenderer(); | 2076 CreateAndSetRenderer(); |
| 2076 | 2077 |
| (...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3357 } | 3358 } |
| 3358 | 3359 |
| 3359 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3360 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3360 std::vector<PictureLayerImpl*>::iterator it = | 3361 std::vector<PictureLayerImpl*>::iterator it = |
| 3361 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3362 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3362 DCHECK(it != picture_layers_.end()); | 3363 DCHECK(it != picture_layers_.end()); |
| 3363 picture_layers_.erase(it); | 3364 picture_layers_.erase(it); |
| 3364 } | 3365 } |
| 3365 | 3366 |
| 3366 } // namespace cc | 3367 } // namespace cc |
| OLD | NEW |