| 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 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 dummyLayer->SetEffectTreeIndex(effectNode.id); | 551 dummyLayer->SetEffectTreeIndex(effectNode.id); |
| 552 dummyLayer->SetScrollTreeIndex(kRealRootNodeId); | 552 dummyLayer->SetScrollTreeIndex(kRealRootNodeId); |
| 553 } | 553 } |
| 554 | 554 |
| 555 } // namespace | 555 } // namespace |
| 556 | 556 |
| 557 void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
tifact) | 557 void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr
tifact) |
| 558 { | 558 { |
| 559 cc::LayerTreeHost* host = m_rootLayer->layer_tree_host(); | 559 cc::LayerTreeHost* host = m_rootLayer->layer_tree_host(); |
| 560 | 560 |
| 561 setMinimalPropertyTrees(host->property_trees(), m_rootLayer->id()); | 561 setMinimalPropertyTrees(host->GetLayerTree()->property_trees(), m_rootLayer-
>id()); |
| 562 m_rootLayer->RemoveAllChildren(); | 562 m_rootLayer->RemoveAllChildren(); |
| 563 m_rootLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); | 563 m_rootLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); |
| 564 m_rootLayer->SetTransformTreeIndex(kSecondaryRootNodeId); | 564 m_rootLayer->SetTransformTreeIndex(kSecondaryRootNodeId); |
| 565 m_rootLayer->SetClipTreeIndex(kSecondaryRootNodeId); | 565 m_rootLayer->SetClipTreeIndex(kSecondaryRootNodeId); |
| 566 m_rootLayer->SetEffectTreeIndex(kSecondaryRootNodeId); | 566 m_rootLayer->SetEffectTreeIndex(kSecondaryRootNodeId); |
| 567 m_rootLayer->SetScrollTreeIndex(kRealRootNodeId); | 567 m_rootLayer->SetScrollTreeIndex(kRealRootNodeId); |
| 568 | 568 |
| 569 PropertyTreeManager propertyTreeManager(*host->property_trees(), m_rootLayer
.get()); | 569 PropertyTreeManager propertyTreeManager(*host->GetLayerTree()->property_tree
s(), m_rootLayer.get()); |
| 570 m_contentLayerClients.clear(); | 570 m_contentLayerClients.clear(); |
| 571 m_contentLayerClients.reserveCapacity(paintArtifact.paintChunks().size()); | 571 m_contentLayerClients.reserveCapacity(paintArtifact.paintChunks().size()); |
| 572 for (const PaintChunk& paintChunk : paintArtifact.paintChunks()) { | 572 for (const PaintChunk& paintChunk : paintArtifact.paintChunks()) { |
| 573 gfx::Vector2dF layerOffset; | 573 gfx::Vector2dF layerOffset; |
| 574 scoped_refptr<cc::Layer> layer = layerForPaintChunk(paintArtifact, paint
Chunk, layerOffset); | 574 scoped_refptr<cc::Layer> layer = layerForPaintChunk(paintArtifact, paint
Chunk, layerOffset); |
| 575 | 575 |
| 576 int transformId = propertyTreeManager.compositorIdForTransformNode(paint
Chunk.properties.transform.get()); | 576 int transformId = propertyTreeManager.compositorIdForTransformNode(paint
Chunk.properties.transform.get()); |
| 577 int clipId = propertyTreeManager.compositorIdForClipNode(paintChunk.prop
erties.clip.get()); | 577 int clipId = propertyTreeManager.compositorIdForClipNode(paintChunk.prop
erties.clip.get()); |
| 578 int effectId = propertyTreeManager.switchToEffectNode(*paintChunk.proper
ties.effect.get()); | 578 int effectId = propertyTreeManager.switchToEffectNode(*paintChunk.proper
ties.effect.get()); |
| 579 | 579 |
| 580 layer->set_offset_to_transform_parent(layerOffset); | 580 layer->set_offset_to_transform_parent(layerOffset); |
| 581 | 581 |
| 582 m_rootLayer->AddChild(layer); | 582 m_rootLayer->AddChild(layer); |
| 583 layer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); | 583 layer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); |
| 584 layer->SetTransformTreeIndex(transformId); | 584 layer->SetTransformTreeIndex(transformId); |
| 585 layer->SetClipTreeIndex(clipId); | 585 layer->SetClipTreeIndex(clipId); |
| 586 layer->SetEffectTreeIndex(effectId); | 586 layer->SetEffectTreeIndex(effectId); |
| 587 layer->SetScrollTreeIndex(kRealRootNodeId); | 587 layer->SetScrollTreeIndex(kRealRootNodeId); |
| 588 | 588 |
| 589 // TODO(jbroman): This probably shouldn't be necessary, but it is still | 589 // TODO(jbroman): This probably shouldn't be necessary, but it is still |
| 590 // queried by RenderSurfaceImpl. | 590 // queried by RenderSurfaceImpl. |
| 591 layer->Set3dSortingContextId(host->property_trees()->transform_tree.Node
(transformId)->sorting_context_id); | 591 layer->Set3dSortingContextId(host->GetLayerTree()->property_trees()->tra
nsform_tree.Node(transformId)->sorting_context_id); |
| 592 | 592 |
| 593 layer->SetShouldCheckBackfaceVisibility(paintChunk.properties.backfaceHi
dden); | 593 layer->SetShouldCheckBackfaceVisibility(paintChunk.properties.backfaceHi
dden); |
| 594 | 594 |
| 595 if (m_extraDataForTestingEnabled) | 595 if (m_extraDataForTestingEnabled) |
| 596 m_extraDataForTesting->contentLayers.append(layer); | 596 m_extraDataForTesting->contentLayers.append(layer); |
| 597 } | 597 } |
| 598 | 598 |
| 599 // Mark the property trees as having been rebuilt. | 599 // Mark the property trees as having been rebuilt. |
| 600 host->property_trees()->sequence_number = kPropertyTreeSequenceNumber; | 600 host->GetLayerTree()->property_trees()->sequence_number = kPropertyTreeSeque
nceNumber; |
| 601 host->property_trees()->needs_rebuild = false; | 601 host->GetLayerTree()->property_trees()->needs_rebuild = false; |
| 602 } | 602 } |
| 603 | 603 |
| 604 } // namespace blink | 604 } // namespace blink |
| OLD | NEW |