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

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

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none Created 3 years, 7 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/paint/display_item_list.h" 10 #include "cc/paint/display_item_list.h"
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 pending_layer.property_tree_state.Clip()); 660 pending_layer.property_tree_state.Clip());
661 int effect_id = property_tree_manager.SwitchToEffectNode( 661 int effect_id = property_tree_manager.SwitchToEffectNode(
662 *pending_layer.property_tree_state.Effect()); 662 *pending_layer.property_tree_state.Effect());
663 663
664 layer->set_offset_to_transform_parent(layer_offset); 664 layer->set_offset_to_transform_parent(layer_offset);
665 CompositorElementId element_id = 665 CompositorElementId element_id =
666 pending_layer.property_tree_state.GetCompositorElementId( 666 pending_layer.property_tree_state.GetCompositorElementId(
667 composited_element_ids); 667 composited_element_ids);
668 if (element_id) { 668 if (element_id) {
669 layer->SetElementId(element_id); 669 layer->SetElementId(element_id);
670 composited_element_ids.insert(element_id); 670 composited_element_ids.insert(element_id.id);
671 } 671 }
672 672
673 root_layer_->AddChild(layer); 673 root_layer_->AddChild(layer);
674 layer->set_property_tree_sequence_number(g_s_property_tree_sequence_number); 674 layer->set_property_tree_sequence_number(g_s_property_tree_sequence_number);
675 layer->SetTransformTreeIndex(transform_id); 675 layer->SetTransformTreeIndex(transform_id);
676 layer->SetClipTreeIndex(clip_id); 676 layer->SetClipTreeIndex(clip_id);
677 layer->SetEffectTreeIndex(effect_id); 677 layer->SetEffectTreeIndex(effect_id);
678 property_tree_manager.UpdateLayerScrollMapping(layer.get(), transform); 678 property_tree_manager.UpdateLayerScrollMapping(layer.get(), transform);
679 679
680 layer->SetShouldCheckBackfaceVisibility(pending_layer.backface_hidden); 680 layer->SetShouldCheckBackfaceVisibility(pending_layer.backface_hidden);
(...skipping 16 matching lines...) Expand all
697 #ifndef NDEBUG 697 #ifndef NDEBUG
698 void PaintArtifactCompositor::ShowDebugData() { 698 void PaintArtifactCompositor::ShowDebugData() {
699 LOG(ERROR) << LayersAsJSON(kLayerTreeIncludesDebugInfo) 699 LOG(ERROR) << LayersAsJSON(kLayerTreeIncludesDebugInfo)
700 ->ToPrettyJSONString() 700 ->ToPrettyJSONString()
701 .Utf8() 701 .Utf8()
702 .data(); 702 .data();
703 } 703 }
704 #endif 704 #endif
705 705
706 } // namespace blink 706 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698