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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 int id = clipTree().Insert(cc::ClipNode(), parentId); | 515 int id = clipTree().Insert(cc::ClipNode(), parentId); |
516 | 516 |
517 cc::ClipNode& compositorNode = *clipTree().Node(id); | 517 cc::ClipNode& compositorNode = *clipTree().Node(id); |
518 compositorNode.owner_id = dummyLayer->id(); | 518 compositorNode.owner_id = dummyLayer->id(); |
519 | 519 |
520 // TODO(jbroman): Don't discard rounded corners. | 520 // TODO(jbroman): Don't discard rounded corners. |
521 compositorNode.clip = clipNode->clipRect().rect(); | 521 compositorNode.clip = clipNode->clipRect().rect(); |
522 compositorNode.transform_id = | 522 compositorNode.transform_id = |
523 compositorIdForTransformNode(clipNode->localTransformSpace()); | 523 compositorIdForTransformNode(clipNode->localTransformSpace()); |
524 compositorNode.target_transform_id = kRealRootNodeId; | 524 compositorNode.target_transform_id = kRealRootNodeId; |
| 525 compositorNode.target_effect_id = kSecondaryRootNodeId; |
525 compositorNode.applies_local_clip = true; | 526 compositorNode.applies_local_clip = true; |
526 compositorNode.layers_are_clipped = true; | 527 compositorNode.layers_are_clipped = true; |
527 compositorNode.layers_are_clipped_when_surfaces_disabled = true; | 528 compositorNode.layers_are_clipped_when_surfaces_disabled = true; |
528 | 529 |
529 m_rootLayer->AddChild(dummyLayer); | 530 m_rootLayer->AddChild(dummyLayer); |
530 dummyLayer->SetTransformTreeIndex(compositorNode.transform_id); | 531 dummyLayer->SetTransformTreeIndex(compositorNode.transform_id); |
531 dummyLayer->SetClipTreeIndex(id); | 532 dummyLayer->SetClipTreeIndex(id); |
532 dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId); | 533 dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId); |
533 dummyLayer->SetScrollTreeIndex(kRealRootNodeId); | 534 dummyLayer->SetScrollTreeIndex(kRealRootNodeId); |
534 dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); | 535 dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
667 scoped_refptr<cc::Layer> dummyLayer = cc::Layer::Create(); | 668 scoped_refptr<cc::Layer> dummyLayer = cc::Layer::Create(); |
668 m_rootLayer->AddChild(dummyLayer); | 669 m_rootLayer->AddChild(dummyLayer); |
669 | 670 |
670 // Also cc assumes a clip node is always created by a layer that creates | 671 // Also cc assumes a clip node is always created by a layer that creates |
671 // render surface. | 672 // render surface. |
672 cc::ClipNode& dummyClip = | 673 cc::ClipNode& dummyClip = |
673 *clipTree().Node(clipTree().Insert(cc::ClipNode(), kSecondaryRootNodeId)); | 674 *clipTree().Node(clipTree().Insert(cc::ClipNode(), kSecondaryRootNodeId)); |
674 dummyClip.owner_id = dummyLayer->id(); | 675 dummyClip.owner_id = dummyLayer->id(); |
675 dummyClip.transform_id = kRealRootNodeId; | 676 dummyClip.transform_id = kRealRootNodeId; |
676 dummyClip.target_transform_id = kRealRootNodeId; | 677 dummyClip.target_transform_id = kRealRootNodeId; |
| 678 dummyClip.target_effect_id = kSecondaryRootNodeId; |
677 | 679 |
678 cc::EffectNode& effectNode = *effectTree().Node(effectTree().Insert( | 680 cc::EffectNode& effectNode = *effectTree().Node(effectTree().Insert( |
679 cc::EffectNode(), compositorIdForCurrentEffectNode())); | 681 cc::EffectNode(), compositorIdForCurrentEffectNode())); |
680 effectNode.owner_id = dummyLayer->id(); | 682 effectNode.owner_id = dummyLayer->id(); |
681 effectNode.clip_id = dummyClip.id; | 683 effectNode.clip_id = dummyClip.id; |
682 effectNode.opacity = nextEffect->opacity(); | 684 effectNode.opacity = nextEffect->opacity(); |
683 m_effectStack.append(BlinkEffectAndCcIdPair{nextEffect, effectNode.id}); | 685 m_effectStack.append(BlinkEffectAndCcIdPair{nextEffect, effectNode.id}); |
684 | 686 |
685 dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); | 687 dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); |
686 dummyLayer->SetTransformTreeIndex(kSecondaryRootNodeId); | 688 dummyLayer->SetTransformTreeIndex(kSecondaryRootNodeId); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 | 761 |
760 if (m_extraDataForTestingEnabled) | 762 if (m_extraDataForTestingEnabled) |
761 m_extraDataForTesting->contentLayers.append(layer); | 763 m_extraDataForTesting->contentLayers.append(layer); |
762 } | 764 } |
763 m_contentLayerClients.clear(); | 765 m_contentLayerClients.clear(); |
764 m_contentLayerClients.swap(newContentLayerClients); | 766 m_contentLayerClients.swap(newContentLayerClients); |
765 | 767 |
766 // Mark the property trees as having been rebuilt. | 768 // Mark the property trees as having been rebuilt. |
767 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; | 769 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; |
768 layerTree->property_trees()->needs_rebuild = false; | 770 layerTree->property_trees()->needs_rebuild = false; |
| 771 layerTree->property_trees()->ResetCachedData(); |
769 } | 772 } |
770 | 773 |
771 } // namespace blink | 774 } // namespace blink |
OLD | NEW |