OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "platform/graphics/compositing/PaintArtifactCompositor.h" | 5 #include "platform/graphics/compositing/PaintArtifactCompositor.h" |
6 | 6 |
7 #include "cc/layers/content_layer_client.h" | 7 #include "cc/layers/content_layer_client.h" |
8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
9 #include "cc/layers/picture_layer.h" | 9 #include "cc/layers/picture_layer.h" |
10 #include "cc/playback/display_item_list.h" | 10 #include "cc/playback/display_item_list.h" |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
633 nodeB = nodeB->parent(); | 633 nodeB = nodeB->parent(); |
634 } | 634 } |
635 return nodeA; | 635 return nodeA; |
636 } | 636 } |
637 | 637 |
638 int PropertyTreeManager::switchToEffectNode( | 638 int PropertyTreeManager::switchToEffectNode( |
639 const EffectPaintPropertyNode& nextEffect) { | 639 const EffectPaintPropertyNode& nextEffect) { |
640 const EffectPaintPropertyNode* ancestor = | 640 const EffectPaintPropertyNode* ancestor = |
641 lowestCommonAncestor(currentEffectNode(), &nextEffect); | 641 lowestCommonAncestor(currentEffectNode(), &nextEffect); |
642 while (currentEffectNode() != ancestor) | 642 while (currentEffectNode() != ancestor) |
643 m_effectStack.removeLast(); | 643 m_effectStack.pop_back(); |
644 | 644 |
645 #if DCHECK_IS_ON() | 645 #if DCHECK_IS_ON() |
646 DCHECK(m_isFirstEffectEver || currentEffectNode()) | 646 DCHECK(m_isFirstEffectEver || currentEffectNode()) |
647 << "Malformed effect tree. Nodes in the same property tree should have " | 647 << "Malformed effect tree. Nodes in the same property tree should have " |
648 "common root. " | 648 "common root. " |
649 << &nextEffect; | 649 << &nextEffect; |
650 m_isFirstEffectEver = false; | 650 m_isFirstEffectEver = false; |
651 #endif | 651 #endif |
652 buildEffectNodesRecursively(&nextEffect); | 652 buildEffectNodesRecursively(&nextEffect); |
653 | 653 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
773 m_contentLayerClients.clear(); | 773 m_contentLayerClients.clear(); |
774 m_contentLayerClients.swap(newContentLayerClients); | 774 m_contentLayerClients.swap(newContentLayerClients); |
775 | 775 |
776 // Mark the property trees as having been rebuilt. | 776 // Mark the property trees as having been rebuilt. |
777 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; | 777 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; |
778 layerTree->property_trees()->needs_rebuild = false; | 778 layerTree->property_trees()->needs_rebuild = false; |
779 layerTree->property_trees()->ResetCachedData(); | 779 layerTree->property_trees()->ResetCachedData(); |
780 } | 780 } |
781 | 781 |
782 } // namespace blink | 782 } // namespace blink |
OLD | NEW |