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.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1149 EventListenerClass::kTouchEndOrCancel, | 1149 EventListenerClass::kTouchEndOrCancel, |
| 1150 event_listener_properties(EventListenerClass::kTouchEndOrCancel)); | 1150 event_listener_properties(EventListenerClass::kTouchEndOrCancel)); |
| 1151 | 1151 |
| 1152 if (page_scale_layer_ && inner_viewport_scroll_layer_) { | 1152 if (page_scale_layer_ && inner_viewport_scroll_layer_) { |
| 1153 tree_impl->SetViewportLayersFromIds( | 1153 tree_impl->SetViewportLayersFromIds( |
| 1154 overscroll_elasticity_layer_ ? overscroll_elasticity_layer_->id() | 1154 overscroll_elasticity_layer_ ? overscroll_elasticity_layer_->id() |
| 1155 : Layer::INVALID_ID, | 1155 : Layer::INVALID_ID, |
| 1156 page_scale_layer_->id(), inner_viewport_scroll_layer_->id(), | 1156 page_scale_layer_->id(), inner_viewport_scroll_layer_->id(), |
| 1157 outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id() | 1157 outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id() |
| 1158 : Layer::INVALID_ID); | 1158 : Layer::INVALID_ID); |
| 1159 DCHECK(inner_viewport_scroll_layer_->IsContainerForFixedPositionLayers()); | 1159 DCHECK(page_scale_layer_->IsContainerForFixedPositionLayers()); |
|
bokan
2017/04/26 21:17:56
I think this DCHECK should be for the outer contai
| |
| 1160 } else { | 1160 } else { |
| 1161 tree_impl->ClearViewportLayers(); | 1161 tree_impl->ClearViewportLayers(); |
| 1162 } | 1162 } |
| 1163 | 1163 |
| 1164 tree_impl->RegisterSelection(selection_); | 1164 tree_impl->RegisterSelection(selection_); |
| 1165 | 1165 |
| 1166 bool property_trees_changed_on_active_tree = | 1166 bool property_trees_changed_on_active_tree = |
| 1167 tree_impl->IsActiveTree() && tree_impl->property_trees()->changed; | 1167 tree_impl->IsActiveTree() && tree_impl->property_trees()->changed; |
| 1168 // Property trees may store damage status. We preserve the sync tree damage | 1168 // Property trees may store damage status. We preserve the sync tree damage |
| 1169 // status by pushing the damage status from sync tree property trees to main | 1169 // status by pushing the damage status from sync tree property trees to main |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1441 void LayerTreeHost::SetNeedsDisplayOnAllLayers() { | 1441 void LayerTreeHost::SetNeedsDisplayOnAllLayers() { |
| 1442 for (auto* layer : *this) | 1442 for (auto* layer : *this) |
| 1443 layer->SetNeedsDisplay(); | 1443 layer->SetNeedsDisplay(); |
| 1444 } | 1444 } |
| 1445 | 1445 |
| 1446 void LayerTreeHost::SetHasCopyRequest(bool has_copy_request) { | 1446 void LayerTreeHost::SetHasCopyRequest(bool has_copy_request) { |
| 1447 has_copy_request_ = has_copy_request; | 1447 has_copy_request_ = has_copy_request; |
| 1448 } | 1448 } |
| 1449 | 1449 |
| 1450 } // namespace cc | 1450 } // namespace cc |
| OLD | NEW |