Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
Patch Set: remove unused test file. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 dummyLayer->SetEffectTreeIndex(effectNode.id); 559 dummyLayer->SetEffectTreeIndex(effectNode.id);
560 dummyLayer->SetScrollTreeIndex(kRealRootNodeId); 560 dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
561 } 561 }
562 562
563 } // namespace 563 } // namespace
564 564
565 void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr tifact) 565 void PaintArtifactCompositor::updateInLayerListMode(const PaintArtifact& paintAr tifact)
566 { 566 {
567 cc::LayerTreeHost* host = m_rootLayer->layer_tree_host(); 567 cc::LayerTreeHost* host = m_rootLayer->layer_tree_host();
568 568
569 setMinimalPropertyTrees(host->property_trees(), m_rootLayer->id()); 569 setMinimalPropertyTrees(host->GetLayerTree()->property_trees(), m_rootLayer- >id());
570 m_rootLayer->RemoveAllChildren(); 570 m_rootLayer->RemoveAllChildren();
571 m_rootLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); 571 m_rootLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
572 m_rootLayer->SetTransformTreeIndex(kSecondaryRootNodeId); 572 m_rootLayer->SetTransformTreeIndex(kSecondaryRootNodeId);
573 m_rootLayer->SetClipTreeIndex(kSecondaryRootNodeId); 573 m_rootLayer->SetClipTreeIndex(kSecondaryRootNodeId);
574 m_rootLayer->SetEffectTreeIndex(kSecondaryRootNodeId); 574 m_rootLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
575 m_rootLayer->SetScrollTreeIndex(kRealRootNodeId); 575 m_rootLayer->SetScrollTreeIndex(kRealRootNodeId);
576 576
577 PropertyTreeManager propertyTreeManager(*host->property_trees(), m_rootLayer .get()); 577 PropertyTreeManager propertyTreeManager(*host->GetLayerTree()->property_tree s(), m_rootLayer.get());
578 m_contentLayerClients.clear(); 578 m_contentLayerClients.clear();
579 m_contentLayerClients.reserveCapacity(paintArtifact.paintChunks().size()); 579 m_contentLayerClients.reserveCapacity(paintArtifact.paintChunks().size());
580 for (const PaintChunk& paintChunk : paintArtifact.paintChunks()) { 580 for (const PaintChunk& paintChunk : paintArtifact.paintChunks()) {
581 gfx::Vector2dF layerOffset; 581 gfx::Vector2dF layerOffset;
582 scoped_refptr<cc::Layer> layer = layerForPaintChunk(paintArtifact, paint Chunk, layerOffset); 582 scoped_refptr<cc::Layer> layer = layerForPaintChunk(paintArtifact, paint Chunk, layerOffset);
583 583
584 int transformId = propertyTreeManager.compositorIdForTransformNode(paint Chunk.properties.transform.get()); 584 int transformId = propertyTreeManager.compositorIdForTransformNode(paint Chunk.properties.transform.get());
585 int clipId = propertyTreeManager.compositorIdForClipNode(paintChunk.prop erties.clip.get()); 585 int clipId = propertyTreeManager.compositorIdForClipNode(paintChunk.prop erties.clip.get());
586 int effectId = propertyTreeManager.switchToEffectNode(*paintChunk.proper ties.effect.get()); 586 int effectId = propertyTreeManager.switchToEffectNode(*paintChunk.proper ties.effect.get());
587 587
588 layer->set_offset_to_transform_parent(layerOffset); 588 layer->set_offset_to_transform_parent(layerOffset);
589 589
590 m_rootLayer->AddChild(layer); 590 m_rootLayer->AddChild(layer);
591 layer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); 591 layer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
592 layer->SetTransformTreeIndex(transformId); 592 layer->SetTransformTreeIndex(transformId);
593 layer->SetClipTreeIndex(clipId); 593 layer->SetClipTreeIndex(clipId);
594 layer->SetEffectTreeIndex(effectId); 594 layer->SetEffectTreeIndex(effectId);
595 layer->SetScrollTreeIndex(kRealRootNodeId); 595 layer->SetScrollTreeIndex(kRealRootNodeId);
596 596
597 // TODO(jbroman): This probably shouldn't be necessary, but it is still 597 // TODO(jbroman): This probably shouldn't be necessary, but it is still
598 // queried by RenderSurfaceImpl. 598 // queried by RenderSurfaceImpl.
599 layer->Set3dSortingContextId(host->property_trees()->transform_tree.Node (transformId)->sorting_context_id); 599 layer->Set3dSortingContextId(host->GetLayerTree()->property_trees()->tra nsform_tree.Node(transformId)->sorting_context_id);
600 600
601 layer->SetShouldCheckBackfaceVisibility(paintChunk.properties.backfaceHi dden); 601 layer->SetShouldCheckBackfaceVisibility(paintChunk.properties.backfaceHi dden);
602 602
603 if (m_extraDataForTestingEnabled) 603 if (m_extraDataForTestingEnabled)
604 m_extraDataForTesting->contentLayers.append(layer); 604 m_extraDataForTesting->contentLayers.append(layer);
605 } 605 }
606 606
607 // Mark the property trees as having been rebuilt. 607 // Mark the property trees as having been rebuilt.
608 host->property_trees()->sequence_number = kPropertyTreeSequenceNumber; 608 host->GetLayerTree()->property_trees()->sequence_number = kPropertyTreeSeque nceNumber;
609 host->property_trees()->needs_rebuild = false; 609 host->GetLayerTree()->property_trees()->needs_rebuild = false;
610 } 610 }
611 611
612 } // namespace blink 612 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698