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

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

Issue 2643203002: Rewrite blink->cc scroll offset logic for SPV2 (Closed)
Patch Set: 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(layer->id(), scrollId);
721
722 layer->set_offset_to_transform_parent(layerOffset); 720 layer->set_offset_to_transform_parent(layerOffset);
723 721
724 m_rootLayer->AddChild(layer); 722 m_rootLayer->AddChild(layer);
725 layer->set_property_tree_sequence_number( 723 layer->set_property_tree_sequence_number(
726 PropertyTreeManager::kPropertyTreeSequenceNumber); 724 PropertyTreeManager::kPropertyTreeSequenceNumber);
727 layer->SetTransformTreeIndex(transformId); 725 layer->SetTransformTreeIndex(transformId);
728 layer->SetClipTreeIndex(clipId); 726 layer->SetClipTreeIndex(clipId);
729 layer->SetEffectTreeIndex(effectId); 727 layer->SetEffectTreeIndex(effectId);
730 layer->SetScrollTreeIndex(scrollId); 728 layer->SetScrollTreeIndex(scrollId);
731 729
(...skipping 15 matching lines...) Expand all
747 #ifndef NDEBUG 745 #ifndef NDEBUG
748 void PaintArtifactCompositor::showDebugData() { 746 void PaintArtifactCompositor::showDebugData() {
749 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo) 747 LOG(ERROR) << layersAsJSON(LayerTreeIncludesDebugInfo)
750 ->toPrettyJSONString() 748 ->toPrettyJSONString()
751 .utf8() 749 .utf8()
752 .data(); 750 .data();
753 } 751 }
754 #endif 752 #endif
755 753
756 } // namespace blink 754 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698