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

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

Issue 2530433003: [SPv2] PaintArtifactorCompositor needs to set target_effect_id for root clip (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 *clipTree.Node(clipTree.Insert(cc::ClipNode(), kRealRootNodeId)); 450 *clipTree.Node(clipTree.Insert(cc::ClipNode(), kRealRootNodeId));
451 DCHECK_EQ(clipNode.id, kSecondaryRootNodeId); 451 DCHECK_EQ(clipNode.id, kSecondaryRootNodeId);
452 452
453 clipNode.resets_clip = true; 453 clipNode.resets_clip = true;
454 clipNode.owner_id = m_rootLayer->id(); 454 clipNode.owner_id = m_rootLayer->id();
455 clipNode.clip_type = cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP; 455 clipNode.clip_type = cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP;
456 clipNode.clip = gfx::RectF( 456 clipNode.clip = gfx::RectF(
457 gfx::SizeF(m_rootLayer->GetLayerTree()->device_viewport_size())); 457 gfx::SizeF(m_rootLayer->GetLayerTree()->device_viewport_size()));
458 clipNode.transform_id = kRealRootNodeId; 458 clipNode.transform_id = kRealRootNodeId;
459 clipNode.target_transform_id = kRealRootNodeId; 459 clipNode.target_transform_id = kRealRootNodeId;
460 clipNode.target_effect_id = kSecondaryRootNodeId;
460 461
461 m_clipNodeMap.set(ClipPaintPropertyNode::root(), clipNode.id); 462 m_clipNodeMap.set(ClipPaintPropertyNode::root(), clipNode.id);
462 m_rootLayer->SetClipTreeIndex(clipNode.id); 463 m_rootLayer->SetClipTreeIndex(clipNode.id);
463 } 464 }
464 465
465 void PropertyTreeManager::setupRootEffectNode() { 466 void PropertyTreeManager::setupRootEffectNode() {
466 // cc is hardcoded to use effect node index 1 for root render surface. 467 // cc is hardcoded to use effect node index 1 for root render surface.
467 cc::EffectTree& effectTree = m_propertyTrees.effect_tree; 468 cc::EffectTree& effectTree = m_propertyTrees.effect_tree;
468 effectTree.clear(); 469 effectTree.clear();
469 cc::EffectNode& effectNode = 470 cc::EffectNode& effectNode =
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 m_contentLayerClients.clear(); 815 m_contentLayerClients.clear();
815 m_contentLayerClients.swap(newContentLayerClients); 816 m_contentLayerClients.swap(newContentLayerClients);
816 817
817 // Mark the property trees as having been rebuilt. 818 // Mark the property trees as having been rebuilt.
818 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; 819 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber;
819 layerTree->property_trees()->needs_rebuild = false; 820 layerTree->property_trees()->needs_rebuild = false;
820 layerTree->property_trees()->ResetCachedData(); 821 layerTree->property_trees()->ResetCachedData();
821 } 822 }
822 823
823 } // namespace blink 824 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698