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

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

Issue 2661523003: cc: Merge LayerTree into the LayerTreeHost. (Closed)
Patch Set: auto Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/test/test_simple_task_runner.h" 7 #include "base/test/test_simple_task_runner.h"
8 #include "base/threading/thread_task_runner_handle.h" 8 #include "base/threading/thread_task_runner_handle.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/test/fake_compositor_frame_sink.h" 10 #include "cc/test/fake_compositor_frame_sink.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 WebLayerTreeViewImplForTesting::defaultLayerTreeSettings(); 85 WebLayerTreeViewImplForTesting::defaultLayerTreeSettings();
86 settings.single_thread_proxy_scheduler = false; 86 settings.single_thread_proxy_scheduler = false;
87 settings.use_layer_lists = true; 87 settings.use_layer_lists = true;
88 m_webLayerTreeView = 88 m_webLayerTreeView =
89 WTF::makeUnique<WebLayerTreeViewWithCompositorFrameSink>(settings); 89 WTF::makeUnique<WebLayerTreeViewWithCompositorFrameSink>(settings);
90 m_webLayerTreeView->setRootLayer(*m_paintArtifactCompositor->getWebLayer()); 90 m_webLayerTreeView->setRootLayer(*m_paintArtifactCompositor->getWebLayer());
91 } 91 }
92 92
93 const cc::PropertyTrees& propertyTrees() { 93 const cc::PropertyTrees& propertyTrees() {
94 return *m_webLayerTreeView->layerTreeHost() 94 return *m_webLayerTreeView->layerTreeHost()
95 ->GetLayerTree()
96 ->property_trees(); 95 ->property_trees();
97 } 96 }
98 97
99 int elementIdToEffectNodeIndex(CompositorElementId elementId) { 98 int elementIdToEffectNodeIndex(CompositorElementId elementId) {
100 return m_webLayerTreeView->layerTreeHost() 99 return m_webLayerTreeView->layerTreeHost()
101 ->GetLayerTree()
102 ->property_trees() 100 ->property_trees()
103 ->element_id_to_effect_node_index[elementId]; 101 ->element_id_to_effect_node_index[elementId];
104 } 102 }
105 103
106 int elementIdToTransformNodeIndex(CompositorElementId elementId) { 104 int elementIdToTransformNodeIndex(CompositorElementId elementId) {
107 return m_webLayerTreeView->layerTreeHost() 105 return m_webLayerTreeView->layerTreeHost()
108 ->GetLayerTree()
109 ->property_trees() 106 ->property_trees()
110 ->element_id_to_transform_node_index[elementId]; 107 ->element_id_to_transform_node_index[elementId];
111 } 108 }
112 109
113 int elementIdToScrollNodeIndex(CompositorElementId elementId) { 110 int elementIdToScrollNodeIndex(CompositorElementId elementId) {
114 return m_webLayerTreeView->layerTreeHost() 111 return m_webLayerTreeView->layerTreeHost()
115 ->GetLayerTree()
116 ->property_trees() 112 ->property_trees()
117 ->element_id_to_scroll_node_index[elementId]; 113 ->element_id_to_scroll_node_index[elementId];
118 } 114 }
119 115
120 const cc::TransformNode& transformNode(const cc::Layer* layer) { 116 const cc::TransformNode& transformNode(const cc::Layer* layer) {
121 return *propertyTrees().transform_tree.Node(layer->transform_tree_index()); 117 return *propertyTrees().transform_tree.Node(layer->transform_tree_index());
122 } 118 }
123 119
124 void update(const PaintArtifact& artifact) { 120 void update(const PaintArtifact& artifact) {
125 GeometryMapper geometryMapper; 121 GeometryMapper geometryMapper;
(...skipping 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 artifact 1659 artifact
1664 .chunk(TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(), 1660 .chunk(TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(),
1665 effect.get()) 1661 effect.get())
1666 .rectDrawing(FloatRect(100, 100, 200, 100), Color::black); 1662 .rectDrawing(FloatRect(100, 100, 200, 100), Color::black);
1667 update(artifact.build()); 1663 update(artifact.build());
1668 1664
1669 EXPECT_EQ(2, elementIdToEffectNodeIndex(expectedCompositorElementId)); 1665 EXPECT_EQ(2, elementIdToEffectNodeIndex(expectedCompositorElementId));
1670 } 1666 }
1671 1667
1672 } // namespace blink 1668 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698