| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layers/picture_layer_impl.h" | 5 #include "cc/layers/picture_layer_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 PictureLayerImpl::~PictureLayerImpl() { | 95 PictureLayerImpl::~PictureLayerImpl() { |
| 96 if (twin_layer_) | 96 if (twin_layer_) |
| 97 twin_layer_->twin_layer_ = nullptr; | 97 twin_layer_->twin_layer_ = nullptr; |
| 98 layer_tree_impl()->UnregisterPictureLayerImpl(this); | 98 layer_tree_impl()->UnregisterPictureLayerImpl(this); |
| 99 } | 99 } |
| 100 | 100 |
| 101 scoped_ptr<TilingSetEvictionQueue> PictureLayerImpl::CreateEvictionQueue( | 101 scoped_ptr<TilingSetEvictionQueue> PictureLayerImpl::CreateEvictionQueue( |
| 102 TreePriority tree_priority) { | 102 TreePriority tree_priority) { |
| 103 if (!tilings_) | 103 if (!tilings_) |
| 104 return make_scoped_ptr(new TilingSetEvictionQueue()); | 104 return make_scoped_ptr(new TilingSetEvictionQueue()); |
| 105 return make_scoped_ptr( | 105 bool skip_shared_out_of_order_tiles = |
| 106 new TilingSetEvictionQueue(tilings_.get(), tree_priority)); | 106 GetPendingOrActiveTwinLayer() != nullptr; |
| 107 return make_scoped_ptr(new TilingSetEvictionQueue( |
| 108 tilings_.get(), tree_priority, skip_shared_out_of_order_tiles)); |
| 107 } | 109 } |
| 108 | 110 |
| 109 const char* PictureLayerImpl::LayerTypeAsString() const { | 111 const char* PictureLayerImpl::LayerTypeAsString() const { |
| 110 return "cc::PictureLayerImpl"; | 112 return "cc::PictureLayerImpl"; |
| 111 } | 113 } |
| 112 | 114 |
| 113 scoped_ptr<LayerImpl> PictureLayerImpl::CreateLayerImpl( | 115 scoped_ptr<LayerImpl> PictureLayerImpl::CreateLayerImpl( |
| 114 LayerTreeImpl* tree_impl) { | 116 LayerTreeImpl* tree_impl) { |
| 115 return PictureLayerImpl::Create(tree_impl, id()); | 117 return PictureLayerImpl::Create(tree_impl, id()); |
| 116 } | 118 } |
| (...skipping 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1477 IteratorType index = stages_[current_stage_].iterator_type; | 1479 IteratorType index = stages_[current_stage_].iterator_type; |
| 1478 TilePriority::PriorityBin tile_type = stages_[current_stage_].tile_type; | 1480 TilePriority::PriorityBin tile_type = stages_[current_stage_].tile_type; |
| 1479 | 1481 |
| 1480 if (iterators_[index] && iterators_[index].get_type() == tile_type) | 1482 if (iterators_[index] && iterators_[index].get_type() == tile_type) |
| 1481 break; | 1483 break; |
| 1482 ++current_stage_; | 1484 ++current_stage_; |
| 1483 } | 1485 } |
| 1484 } | 1486 } |
| 1485 | 1487 |
| 1486 } // namespace cc | 1488 } // namespace cc |
| OLD | NEW |