| 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 3182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3193 ActivationStateAsValueInto(state); | 3193 ActivationStateAsValueInto(state); |
| 3194 state->EndDictionary(); | 3194 state->EndDictionary(); |
| 3195 } | 3195 } |
| 3196 state->BeginDictionary("device_viewport_size"); | 3196 state->BeginDictionary("device_viewport_size"); |
| 3197 MathUtil::AddToTracedValue(device_viewport_size_, state); | 3197 MathUtil::AddToTracedValue(device_viewport_size_, state); |
| 3198 state->EndDictionary(); | 3198 state->EndDictionary(); |
| 3199 if (tile_manager_) { | 3199 if (tile_manager_) { |
| 3200 state->BeginArray("tiles"); | 3200 state->BeginArray("tiles"); |
| 3201 tile_manager_->AllTilesAsValueInto(state); | 3201 tile_manager_->AllTilesAsValueInto(state); |
| 3202 state->EndArray(); | 3202 state->EndArray(); |
| 3203 |
| 3204 state->BeginDictionary("tile_manager_basic_state"); |
| 3205 tile_manager_->BasicStateAsValueInto(state); |
| 3206 state->EndDictionary(); |
| 3203 } | 3207 } |
| 3204 state->BeginDictionary("active_tree"); | 3208 state->BeginDictionary("active_tree"); |
| 3205 active_tree_->AsValueInto(state); | 3209 active_tree_->AsValueInto(state); |
| 3206 state->EndDictionary(); | 3210 state->EndDictionary(); |
| 3207 if (pending_tree_) { | 3211 if (pending_tree_) { |
| 3208 state->BeginDictionary("pending_tree"); | 3212 state->BeginDictionary("pending_tree"); |
| 3209 pending_tree_->AsValueInto(state); | 3213 pending_tree_->AsValueInto(state); |
| 3210 state->EndDictionary(); | 3214 state->EndDictionary(); |
| 3211 } | 3215 } |
| 3212 if (frame) { | 3216 if (frame) { |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3371 } | 3375 } |
| 3372 | 3376 |
| 3373 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3377 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3374 std::vector<PictureLayerImpl*>::iterator it = | 3378 std::vector<PictureLayerImpl*>::iterator it = |
| 3375 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3379 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3376 DCHECK(it != picture_layers_.end()); | 3380 DCHECK(it != picture_layers_.end()); |
| 3377 picture_layers_.erase(it); | 3381 picture_layers_.erase(it); |
| 3378 } | 3382 } |
| 3379 | 3383 |
| 3380 } // namespace cc | 3384 } // namespace cc |
| OLD | NEW |