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

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

Issue 2437923002: cc: Change ClipNode::applies_local_clip to a clip_type enum (Closed)
Patch Set: Fix Windows build Created 4 years, 1 month 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 515
516 cc::ClipNode& compositorNode = *clipTree().Node(id); 516 cc::ClipNode& compositorNode = *clipTree().Node(id);
517 compositorNode.owner_id = dummyLayer->id(); 517 compositorNode.owner_id = dummyLayer->id();
518 518
519 // TODO(jbroman): Don't discard rounded corners. 519 // TODO(jbroman): Don't discard rounded corners.
520 compositorNode.clip = clipNode->clipRect().rect(); 520 compositorNode.clip = clipNode->clipRect().rect();
521 compositorNode.transform_id = 521 compositorNode.transform_id =
522 compositorIdForTransformNode(clipNode->localTransformSpace()); 522 compositorIdForTransformNode(clipNode->localTransformSpace());
523 compositorNode.target_transform_id = kRealRootNodeId; 523 compositorNode.target_transform_id = kRealRootNodeId;
524 compositorNode.target_effect_id = kSecondaryRootNodeId; 524 compositorNode.target_effect_id = kSecondaryRootNodeId;
525 compositorNode.applies_local_clip = true; 525 compositorNode.clip_type = cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP;
526 compositorNode.layers_are_clipped = true; 526 compositorNode.layers_are_clipped = true;
527 compositorNode.layers_are_clipped_when_surfaces_disabled = true; 527 compositorNode.layers_are_clipped_when_surfaces_disabled = true;
528 528
529 m_rootLayer->AddChild(dummyLayer); 529 m_rootLayer->AddChild(dummyLayer);
530 dummyLayer->SetTransformTreeIndex(compositorNode.transform_id); 530 dummyLayer->SetTransformTreeIndex(compositorNode.transform_id);
531 dummyLayer->SetClipTreeIndex(id); 531 dummyLayer->SetClipTreeIndex(id);
532 dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId); 532 dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
533 dummyLayer->SetScrollTreeIndex(kRealRootNodeId); 533 dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
534 dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber); 534 dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
535 535
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 m_contentLayerClients.clear(); 764 m_contentLayerClients.clear();
765 m_contentLayerClients.swap(newContentLayerClients); 765 m_contentLayerClients.swap(newContentLayerClients);
766 766
767 // Mark the property trees as having been rebuilt. 767 // Mark the property trees as having been rebuilt.
768 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber; 768 layerTree->property_trees()->sequence_number = kPropertyTreeSequenceNumber;
769 layerTree->property_trees()->needs_rebuild = false; 769 layerTree->property_trees()->needs_rebuild = false;
770 layerTree->property_trees()->ResetCachedData(); 770 layerTree->property_trees()->ResetCachedData();
771 } 771 }
772 772
773 } // namespace blink 773 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698