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/compositing_display_item.h" | 10 #include "cc/playback/compositing_display_item.h" |
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 int scrollId = propertyTreeManager.ensureCompositorScrollNode( | 713 int scrollId = propertyTreeManager.ensureCompositorScrollNode( |
714 pendingLayer.propertyTreeState.scroll()); | 714 pendingLayer.propertyTreeState.scroll()); |
715 int clipId = propertyTreeManager.ensureCompositorClipNode( | 715 int clipId = propertyTreeManager.ensureCompositorClipNode( |
716 pendingLayer.propertyTreeState.clip()); | 716 pendingLayer.propertyTreeState.clip()); |
717 int effectId = propertyTreeManager.switchToEffectNode( | 717 int effectId = propertyTreeManager.switchToEffectNode( |
718 *pendingLayer.propertyTreeState.effect()); | 718 *pendingLayer.propertyTreeState.effect()); |
719 | 719 |
720 propertyTreeManager.updateScrollOffset(layer->id(), scrollId); | 720 propertyTreeManager.updateScrollOffset(layer->id(), scrollId); |
721 | 721 |
722 layer->set_offset_to_transform_parent(layerOffset); | 722 layer->set_offset_to_transform_parent(layerOffset); |
| 723 layer->SetElementId(pendingLayer.propertyTreeState.compositorElementId()); |
723 | 724 |
724 m_rootLayer->AddChild(layer); | 725 m_rootLayer->AddChild(layer); |
725 layer->set_property_tree_sequence_number( | 726 layer->set_property_tree_sequence_number( |
726 PropertyTreeManager::kPropertyTreeSequenceNumber); | 727 PropertyTreeManager::kPropertyTreeSequenceNumber); |
727 layer->SetTransformTreeIndex(transformId); | 728 layer->SetTransformTreeIndex(transformId); |
728 layer->SetClipTreeIndex(clipId); | 729 layer->SetClipTreeIndex(clipId); |
729 layer->SetEffectTreeIndex(effectId); | 730 layer->SetEffectTreeIndex(effectId); |
730 layer->SetScrollTreeIndex(scrollId); | 731 layer->SetScrollTreeIndex(scrollId); |
731 | 732 |
732 layer->SetShouldCheckBackfaceVisibility(pendingLayer.backfaceHidden); | 733 layer->SetShouldCheckBackfaceVisibility(pendingLayer.backfaceHidden); |
(...skipping 14 matching lines...) Expand all Loading... |
747 #ifndef NDEBUG | 748 #ifndef NDEBUG |
748 void PaintArtifactCompositor::showDebugData() { | 749 void PaintArtifactCompositor::showDebugData() { |
749 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo) | 750 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo) |
750 ->toPrettyJSONString() | 751 ->toPrettyJSONString() |
751 .utf8() | 752 .utf8() |
752 .data(); | 753 .data(); |
753 } | 754 } |
754 #endif | 755 #endif |
755 | 756 |
756 } // namespace blink | 757 } // namespace blink |
OLD | NEW |