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

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

Issue 2651093003: Make scroll translation transform nodes reference scroll nodes (Closed)
Patch Set: Add note about scroll tree differences Created 3 years, 11 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/compositing_display_item.h" 10 #include "cc/playback/compositing_display_item.h"
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 710
711 int transformId = propertyTreeManager.ensureCompositorTransformNode( 711 int transformId = propertyTreeManager.ensureCompositorTransformNode(
712 pendingLayer.propertyTreeState.transform()); 712 pendingLayer.propertyTreeState.transform());
713 int scrollId = propertyTreeManager.ensureCompositorScrollNode( 713 int scrollId = propertyTreeManager.ensureCompositorScrollNode(
714 pendingLayer.propertyTreeState.scroll()); 714 pendingLayer.propertyTreeState.scroll());
715 int clipId = propertyTreeManager.ensureCompositorClipNode( 715 int clipId = propertyTreeManager.ensureCompositorClipNode(
716 pendingLayer.propertyTreeState.clip()); 716 pendingLayer.propertyTreeState.clip());
717 int effectId = propertyTreeManager.switchToEffectNode( 717 int effectId = propertyTreeManager.switchToEffectNode(
718 *pendingLayer.propertyTreeState.effect()); 718 *pendingLayer.propertyTreeState.effect());
719 719
720 propertyTreeManager.updateScrollOffset(
721 pendingLayer.propertyTreeState.scroll());
722
723 layer->set_offset_to_transform_parent(layerOffset); 720 layer->set_offset_to_transform_parent(layerOffset);
724 layer->SetElementId(pendingLayer.propertyTreeState.compositorElementId()); 721 layer->SetElementId(pendingLayer.propertyTreeState.compositorElementId());
725 722
726 m_rootLayer->AddChild(layer); 723 m_rootLayer->AddChild(layer);
727 layer->set_property_tree_sequence_number( 724 layer->set_property_tree_sequence_number(
728 PropertyTreeManager::kPropertyTreeSequenceNumber); 725 PropertyTreeManager::kPropertyTreeSequenceNumber);
729 layer->SetTransformTreeIndex(transformId); 726 layer->SetTransformTreeIndex(transformId);
730 layer->SetClipTreeIndex(clipId); 727 layer->SetClipTreeIndex(clipId);
731 layer->SetEffectTreeIndex(effectId); 728 layer->SetEffectTreeIndex(effectId);
732 layer->SetScrollTreeIndex(scrollId); 729 layer->SetScrollTreeIndex(scrollId);
(...skipping 16 matching lines...) Expand all
749 #ifndef NDEBUG 746 #ifndef NDEBUG
750 void PaintArtifactCompositor::showDebugData() { 747 void PaintArtifactCompositor::showDebugData() {
751 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo) 748 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo)
752 ->toPrettyJSONString() 749 ->toPrettyJSONString()
753 .utf8() 750 .utf8()
754 .data(); 751 .data();
755 } 752 }
756 #endif 753 #endif
757 754
758 } // namespace blink 755 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698