Chromium Code Reviews| 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 3201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3212 FrameData* frame, | 3212 FrameData* frame, |
| 3213 base::debug::TracedValue* state) const { | 3213 base::debug::TracedValue* state) const { |
| 3214 if (this->pending_tree_) { | 3214 if (this->pending_tree_) { |
| 3215 state->BeginDictionary("activation_state"); | 3215 state->BeginDictionary("activation_state"); |
| 3216 ActivationStateAsValueInto(state); | 3216 ActivationStateAsValueInto(state); |
| 3217 state->EndDictionary(); | 3217 state->EndDictionary(); |
| 3218 } | 3218 } |
| 3219 state->BeginDictionary("device_viewport_size"); | 3219 state->BeginDictionary("device_viewport_size"); |
| 3220 MathUtil::AddToTracedValue(device_viewport_size_, state); | 3220 MathUtil::AddToTracedValue(device_viewport_size_, state); |
| 3221 state->EndDictionary(); | 3221 state->EndDictionary(); |
| 3222 | |
| 3223 std::set<const Tile*> tiles; | |
| 3224 active_tree_->AllTilesForTracingInto(&tiles); | |
| 3225 if (pending_tree_) | |
| 3226 pending_tree_->AllTilesForTracingInto(&tiles); | |
| 3227 | |
| 3222 if (tile_manager_) { | 3228 if (tile_manager_) { |
| 3223 state->BeginArray("tiles"); | 3229 state->BeginArray("tiles"); |
| 3224 tile_manager_->AllTilesAsValueInto(state); | 3230 tile_manager_->AllTilesAsValueInto(state, tiles); |
|
enne (OOO)
2014/08/20 17:37:34
Something seems redundant here. Why do you need t
vmpstr
2014/08/20 17:41:11
TileManager's tiles include recycled tiles (in fac
enne (OOO)
2014/08/20 18:05:42
Should the TileManager::AllTilesAsValueInto get re
vmpstr
2014/08/20 18:18:58
Hmm. Well, I don't really know. I feel like it's a
| |
| 3225 state->EndArray(); | 3231 state->EndArray(); |
| 3226 | 3232 |
| 3227 state->BeginDictionary("tile_manager_basic_state"); | 3233 state->BeginDictionary("tile_manager_basic_state"); |
| 3228 tile_manager_->BasicStateAsValueInto(state); | 3234 tile_manager_->BasicStateAsValueInto(state); |
| 3229 state->EndDictionary(); | 3235 state->EndDictionary(); |
| 3230 } | 3236 } |
| 3231 state->BeginDictionary("active_tree"); | 3237 state->BeginDictionary("active_tree"); |
| 3232 active_tree_->AsValueInto(state); | 3238 active_tree_->AsValueInto(state); |
| 3233 state->EndDictionary(); | 3239 state->EndDictionary(); |
| 3234 if (pending_tree_) { | 3240 if (pending_tree_) { |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3412 } | 3418 } |
| 3413 | 3419 |
| 3414 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3420 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3415 std::vector<PictureLayerImpl*>::iterator it = | 3421 std::vector<PictureLayerImpl*>::iterator it = |
| 3416 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3422 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3417 DCHECK(it != picture_layers_.end()); | 3423 DCHECK(it != picture_layers_.end()); |
| 3418 picture_layers_.erase(it); | 3424 picture_layers_.erase(it); |
| 3419 } | 3425 } |
| 3420 | 3426 |
| 3421 } // namespace cc | 3427 } // namespace cc |
| OLD | NEW |