OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "cc/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "cc/animation/layer_animation_controller.h" | 9 #include "cc/animation/layer_animation_controller.h" |
10 #include "cc/animation/transform_operations.h" | 10 #include "cc/animation/transform_operations.h" |
11 #include "cc/base/math_util.h" | 11 #include "cc/base/math_util.h" |
12 #include "cc/layers/content_layer.h" | 12 #include "cc/layers/content_layer.h" |
13 #include "cc/layers/content_layer_client.h" | 13 #include "cc/layers/content_layer_client.h" |
14 #include "cc/layers/heads_up_display_layer_impl.h" | 14 #include "cc/layers/heads_up_display_layer_impl.h" |
15 #include "cc/layers/layer.h" | 15 #include "cc/layers/layer.h" |
16 #include "cc/layers/layer_client.h" | 16 #include "cc/layers/layer_client.h" |
17 #include "cc/layers/layer_impl.h" | 17 #include "cc/layers/layer_impl.h" |
| 18 #include "cc/layers/layer_iterator.h" |
18 #include "cc/layers/render_surface.h" | 19 #include "cc/layers/render_surface.h" |
19 #include "cc/layers/render_surface_impl.h" | 20 #include "cc/layers/render_surface_impl.h" |
20 #include "cc/output/copy_output_request.h" | 21 #include "cc/output/copy_output_request.h" |
21 #include "cc/output/copy_output_result.h" | 22 #include "cc/output/copy_output_result.h" |
22 #include "cc/test/animation_test_common.h" | 23 #include "cc/test/animation_test_common.h" |
23 #include "cc/test/fake_impl_proxy.h" | 24 #include "cc/test/fake_impl_proxy.h" |
24 #include "cc/test/fake_layer_tree_host.h" | 25 #include "cc/test/fake_layer_tree_host.h" |
25 #include "cc/test/fake_layer_tree_host_impl.h" | 26 #include "cc/test/fake_layer_tree_host_impl.h" |
26 #include "cc/test/geometry_test_utils.h" | 27 #include "cc/test/geometry_test_utils.h" |
27 #include "cc/trees/layer_tree_impl.h" | 28 #include "cc/trees/layer_tree_impl.h" |
28 #include "cc/trees/proxy.h" | 29 #include "cc/trees/proxy.h" |
29 #include "cc/trees/single_thread_proxy.h" | 30 #include "cc/trees/single_thread_proxy.h" |
30 #include "testing/gmock/include/gmock/gmock.h" | 31 #include "testing/gmock/include/gmock/gmock.h" |
31 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
32 #include "ui/gfx/quad_f.h" | 33 #include "ui/gfx/quad_f.h" |
33 #include "ui/gfx/size_conversions.h" | 34 #include "ui/gfx/size_conversions.h" |
34 #include "ui/gfx/transform.h" | 35 #include "ui/gfx/transform.h" |
35 | 36 |
36 namespace cc { | 37 namespace cc { |
37 namespace { | 38 namespace { |
38 | 39 |
39 class LayerTreeHostCommonTestBase { | 40 class LayerTreeHostCommonTestBase { |
40 protected: | 41 protected: |
| 42 LayerTreeHostCommonTestBase() : render_surface_layer_list_count_(0) {} |
| 43 |
41 template <typename LayerType> | 44 template <typename LayerType> |
42 void SetLayerPropertiesForTestingInternal( | 45 void SetLayerPropertiesForTestingInternal( |
43 LayerType* layer, | 46 LayerType* layer, |
44 const gfx::Transform& transform, | 47 const gfx::Transform& transform, |
45 const gfx::PointF& anchor, | 48 const gfx::PointF& anchor, |
46 const gfx::PointF& position, | 49 const gfx::PointF& position, |
47 const gfx::Size& bounds, | 50 const gfx::Size& bounds, |
48 bool flatten_transform, | 51 bool flatten_transform, |
49 bool is_3d_sorted) { | 52 bool is_3d_sorted) { |
50 layer->SetTransform(transform); | 53 layer->SetTransform(transform); |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 inputs.can_adjust_raster_scales = true; | 116 inputs.can_adjust_raster_scales = true; |
114 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 117 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
115 } | 118 } |
116 | 119 |
117 void ExecuteCalculateDrawProperties(LayerImpl* root_layer, | 120 void ExecuteCalculateDrawProperties(LayerImpl* root_layer, |
118 float device_scale_factor, | 121 float device_scale_factor, |
119 float page_scale_factor, | 122 float page_scale_factor, |
120 LayerImpl* page_scale_application_layer, | 123 LayerImpl* page_scale_application_layer, |
121 bool can_use_lcd_text) { | 124 bool can_use_lcd_text) { |
122 gfx::Transform identity_matrix; | 125 gfx::Transform identity_matrix; |
123 LayerImplList dummy_render_surface_layer_list; | |
124 gfx::Size device_viewport_size = | 126 gfx::Size device_viewport_size = |
125 gfx::Size(root_layer->bounds().width() * device_scale_factor, | 127 gfx::Size(root_layer->bounds().width() * device_scale_factor, |
126 root_layer->bounds().height() * device_scale_factor); | 128 root_layer->bounds().height() * device_scale_factor); |
127 | 129 |
| 130 render_surface_layer_list_impl_.reset(new LayerImplList); |
| 131 |
128 // We are probably not testing what is intended if the root_layer bounds are | 132 // We are probably not testing what is intended if the root_layer bounds are |
129 // empty. | 133 // empty. |
130 DCHECK(!root_layer->bounds().IsEmpty()); | 134 DCHECK(!root_layer->bounds().IsEmpty()); |
131 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( | 135 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
132 root_layer, device_viewport_size, &dummy_render_surface_layer_list); | 136 root_layer, |
| 137 device_viewport_size, |
| 138 render_surface_layer_list_impl_.get()); |
133 inputs.device_scale_factor = device_scale_factor; | 139 inputs.device_scale_factor = device_scale_factor; |
134 inputs.page_scale_factor = page_scale_factor; | 140 inputs.page_scale_factor = page_scale_factor; |
135 inputs.page_scale_application_layer = page_scale_application_layer; | 141 inputs.page_scale_application_layer = page_scale_application_layer; |
136 inputs.can_use_lcd_text = can_use_lcd_text; | 142 inputs.can_use_lcd_text = can_use_lcd_text; |
137 inputs.can_adjust_raster_scales = true; | 143 inputs.can_adjust_raster_scales = true; |
| 144 |
| 145 ++render_surface_layer_list_count_; |
| 146 inputs.current_render_surface_layer_list_id = |
| 147 render_surface_layer_list_count_; |
| 148 |
138 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 149 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
139 } | 150 } |
140 | 151 |
141 template <class LayerType> | 152 template <class LayerType> |
142 void ExecuteCalculateDrawProperties(LayerType* root_layer) { | 153 void ExecuteCalculateDrawProperties(LayerType* root_layer) { |
143 LayerType* page_scale_application_layer = NULL; | 154 LayerType* page_scale_application_layer = NULL; |
144 ExecuteCalculateDrawProperties( | 155 ExecuteCalculateDrawProperties( |
145 root_layer, 1.f, 1.f, page_scale_application_layer, false); | 156 root_layer, 1.f, 1.f, page_scale_application_layer, false); |
146 } | 157 } |
147 | 158 |
(...skipping 17 matching lines...) Expand all Loading... |
165 device_scale_factor, | 176 device_scale_factor, |
166 page_scale_factor, | 177 page_scale_factor, |
167 page_scale_application_layer, | 178 page_scale_application_layer, |
168 false); | 179 false); |
169 } | 180 } |
170 | 181 |
171 RenderSurfaceLayerList* render_surface_layer_list() const { | 182 RenderSurfaceLayerList* render_surface_layer_list() const { |
172 return render_surface_layer_list_.get(); | 183 return render_surface_layer_list_.get(); |
173 } | 184 } |
174 | 185 |
| 186 LayerImplList* render_surface_layer_list_impl() const { |
| 187 return render_surface_layer_list_impl_.get(); |
| 188 } |
| 189 |
| 190 int render_surface_layer_list_count() const { |
| 191 return render_surface_layer_list_count_; |
| 192 } |
| 193 |
175 private: | 194 private: |
176 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; | 195 scoped_ptr<RenderSurfaceLayerList> render_surface_layer_list_; |
| 196 scoped_ptr<LayerImplList> render_surface_layer_list_impl_; |
| 197 |
| 198 int render_surface_layer_list_count_; |
177 }; | 199 }; |
178 | 200 |
179 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, | 201 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase, |
180 public testing::Test { | 202 public testing::Test { |
181 }; | 203 }; |
182 | 204 |
183 class LayerWithForcedDrawsContent : public Layer { | 205 class LayerWithForcedDrawsContent : public Layer { |
184 public: | 206 public: |
185 LayerWithForcedDrawsContent() : Layer(), last_device_scale_factor_(0.f) {} | 207 LayerWithForcedDrawsContent() : Layer(), last_device_scale_factor_(0.f) {} |
186 | 208 |
(...skipping 9958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
10145 | 10167 |
10146 ExecuteCalculateDrawProperties(grand_parent.get()); | 10168 ExecuteCalculateDrawProperties(grand_parent.get()); |
10147 | 10169 |
10148 // |grand_parent| has a transform that's neither a translation nor a scale. | 10170 // |grand_parent| has a transform that's neither a translation nor a scale. |
10149 EXPECT_EQ(0.f, grand_parent->last_maximum_animation_contents_scale()); | 10171 EXPECT_EQ(0.f, grand_parent->last_maximum_animation_contents_scale()); |
10150 EXPECT_EQ(0.f, parent_raw->last_maximum_animation_contents_scale()); | 10172 EXPECT_EQ(0.f, parent_raw->last_maximum_animation_contents_scale()); |
10151 EXPECT_EQ(0.f, child_raw->last_maximum_animation_contents_scale()); | 10173 EXPECT_EQ(0.f, child_raw->last_maximum_animation_contents_scale()); |
10152 EXPECT_EQ(0.f, grand_child_raw->last_maximum_animation_contents_scale()); | 10174 EXPECT_EQ(0.f, grand_child_raw->last_maximum_animation_contents_scale()); |
10153 } | 10175 } |
10154 | 10176 |
| 10177 static int membership_id(LayerImpl* layer) { |
| 10178 return layer->draw_properties().last_drawn_render_surface_layer_list_id; |
| 10179 } |
| 10180 |
| 10181 static void GatherDrawnLayers(LayerImplList* rsll, |
| 10182 std::set<LayerImpl*>* drawn_layers) { |
| 10183 for (LayerIterator<LayerImpl> it = LayerIterator<LayerImpl>::Begin(rsll), |
| 10184 end = LayerIterator<LayerImpl>::End(rsll); |
| 10185 it != end; |
| 10186 ++it) { |
| 10187 LayerImpl* layer = *it; |
| 10188 if (it.represents_itself()) |
| 10189 drawn_layers->insert(layer); |
| 10190 |
| 10191 if (!it.represents_contributing_render_surface()) |
| 10192 continue; |
| 10193 |
| 10194 if (layer->mask_layer()) |
| 10195 drawn_layers->insert(layer->mask_layer()); |
| 10196 if (layer->replica_layer() && layer->replica_layer()->mask_layer()) |
| 10197 drawn_layers->insert(layer->replica_layer()->mask_layer()); |
| 10198 } |
| 10199 } |
| 10200 |
| 10201 TEST_F(LayerTreeHostCommonTest, RenderSurfaceLayerListMembership) { |
| 10202 FakeImplProxy proxy; |
| 10203 TestSharedBitmapManager shared_bitmap_manager; |
| 10204 FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager); |
| 10205 gfx::Transform identity_matrix; |
| 10206 |
| 10207 scoped_ptr<LayerImpl> grand_parent = |
| 10208 LayerImpl::Create(host_impl.active_tree(), 1); |
| 10209 scoped_ptr<LayerImpl> parent = LayerImpl::Create(host_impl.active_tree(), 3); |
| 10210 scoped_ptr<LayerImpl> child = LayerImpl::Create(host_impl.active_tree(), 5); |
| 10211 scoped_ptr<LayerImpl> grand_child1 = |
| 10212 LayerImpl::Create(host_impl.active_tree(), 7); |
| 10213 scoped_ptr<LayerImpl> grand_child2 = |
| 10214 LayerImpl::Create(host_impl.active_tree(), 9); |
| 10215 |
| 10216 LayerImpl* grand_parent_raw = grand_parent.get(); |
| 10217 LayerImpl* parent_raw = parent.get(); |
| 10218 LayerImpl* child_raw = child.get(); |
| 10219 LayerImpl* grand_child1_raw = grand_child1.get(); |
| 10220 LayerImpl* grand_child2_raw = grand_child2.get(); |
| 10221 |
| 10222 child->AddChild(grand_child1.Pass()); |
| 10223 child->AddChild(grand_child2.Pass()); |
| 10224 parent->AddChild(child.Pass()); |
| 10225 grand_parent->AddChild(parent.Pass()); |
| 10226 |
| 10227 SetLayerPropertiesForTesting(grand_parent_raw, |
| 10228 identity_matrix, |
| 10229 gfx::PointF(), |
| 10230 gfx::PointF(), |
| 10231 gfx::Size(1, 2), |
| 10232 true, |
| 10233 false); |
| 10234 SetLayerPropertiesForTesting(parent_raw, |
| 10235 identity_matrix, |
| 10236 gfx::PointF(), |
| 10237 gfx::PointF(), |
| 10238 gfx::Size(1, 2), |
| 10239 true, |
| 10240 false); |
| 10241 SetLayerPropertiesForTesting(child_raw, |
| 10242 identity_matrix, |
| 10243 gfx::PointF(), |
| 10244 gfx::PointF(), |
| 10245 gfx::Size(1, 2), |
| 10246 true, |
| 10247 false); |
| 10248 SetLayerPropertiesForTesting(grand_child1_raw, |
| 10249 identity_matrix, |
| 10250 gfx::PointF(), |
| 10251 gfx::PointF(), |
| 10252 gfx::Size(1, 2), |
| 10253 true, |
| 10254 false); |
| 10255 SetLayerPropertiesForTesting(grand_child2_raw, |
| 10256 identity_matrix, |
| 10257 gfx::PointF(), |
| 10258 gfx::PointF(), |
| 10259 gfx::Size(1, 2), |
| 10260 true, |
| 10261 false); |
| 10262 |
| 10263 // Start with nothing being drawn. |
| 10264 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10265 int member_id = render_surface_layer_list_count(); |
| 10266 |
| 10267 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10268 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10269 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10270 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10271 EXPECT_NE(member_id, membership_id(grand_child2_raw)); |
| 10272 |
| 10273 std::set<LayerImpl*> expected; |
| 10274 std::set<LayerImpl*> actual; |
| 10275 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10276 EXPECT_EQ(expected, actual); |
| 10277 |
| 10278 // If we force render surface, but none of the layers are in the layer list, |
| 10279 // then this layer should not appear in RSLL. |
| 10280 grand_child1_raw->SetForceRenderSurface(true); |
| 10281 |
| 10282 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10283 member_id = render_surface_layer_list_count(); |
| 10284 |
| 10285 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10286 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10287 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10288 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10289 EXPECT_NE(member_id, membership_id(grand_child2_raw)); |
| 10290 |
| 10291 expected.clear(); |
| 10292 actual.clear(); |
| 10293 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10294 EXPECT_EQ(expected, actual); |
| 10295 |
| 10296 // However, if we say that this layer also draws content, it will appear in |
| 10297 // RSLL. |
| 10298 grand_child1_raw->SetDrawsContent(true); |
| 10299 |
| 10300 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10301 member_id = render_surface_layer_list_count(); |
| 10302 |
| 10303 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10304 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10305 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10306 EXPECT_EQ(member_id, membership_id(grand_child1_raw)); |
| 10307 EXPECT_NE(member_id, membership_id(grand_child2_raw)); |
| 10308 |
| 10309 expected.clear(); |
| 10310 expected.insert(grand_child1_raw); |
| 10311 |
| 10312 actual.clear(); |
| 10313 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10314 EXPECT_EQ(expected, actual); |
| 10315 |
| 10316 // Now child is forced to have a render surface, and one if its children draws |
| 10317 // content. |
| 10318 grand_child1_raw->SetDrawsContent(false); |
| 10319 grand_child1_raw->SetForceRenderSurface(false); |
| 10320 child_raw->SetForceRenderSurface(true); |
| 10321 grand_child2_raw->SetDrawsContent(true); |
| 10322 |
| 10323 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10324 member_id = render_surface_layer_list_count(); |
| 10325 |
| 10326 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10327 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10328 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10329 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10330 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); |
| 10331 |
| 10332 expected.clear(); |
| 10333 expected.insert(grand_child2_raw); |
| 10334 |
| 10335 actual.clear(); |
| 10336 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10337 EXPECT_EQ(expected, actual); |
| 10338 |
| 10339 // Add a mask layer to child. |
| 10340 child_raw->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 6).Pass()); |
| 10341 |
| 10342 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10343 member_id = render_surface_layer_list_count(); |
| 10344 |
| 10345 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10346 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10347 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10348 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer())); |
| 10349 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10350 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); |
| 10351 |
| 10352 expected.clear(); |
| 10353 expected.insert(grand_child2_raw); |
| 10354 expected.insert(child_raw->mask_layer()); |
| 10355 |
| 10356 expected.clear(); |
| 10357 expected.insert(grand_child2_raw); |
| 10358 expected.insert(child_raw->mask_layer()); |
| 10359 |
| 10360 actual.clear(); |
| 10361 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10362 EXPECT_EQ(expected, actual); |
| 10363 |
| 10364 // Add replica mask layer. |
| 10365 scoped_ptr<LayerImpl> replica_layer = |
| 10366 LayerImpl::Create(host_impl.active_tree(), 20); |
| 10367 replica_layer->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 21)); |
| 10368 child_raw->SetReplicaLayer(replica_layer.Pass()); |
| 10369 |
| 10370 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10371 member_id = render_surface_layer_list_count(); |
| 10372 |
| 10373 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10374 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10375 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10376 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer())); |
| 10377 EXPECT_EQ(member_id, membership_id(child_raw->replica_layer()->mask_layer())); |
| 10378 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10379 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); |
| 10380 |
| 10381 expected.clear(); |
| 10382 expected.insert(grand_child2_raw); |
| 10383 expected.insert(child_raw->mask_layer()); |
| 10384 expected.insert(child_raw->replica_layer()->mask_layer()); |
| 10385 |
| 10386 actual.clear(); |
| 10387 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10388 EXPECT_EQ(expected, actual); |
| 10389 |
| 10390 child_raw->TakeReplicaLayer(); |
| 10391 |
| 10392 // With nothing drawing, we should have no layers. |
| 10393 grand_child2_raw->SetDrawsContent(false); |
| 10394 |
| 10395 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10396 member_id = render_surface_layer_list_count(); |
| 10397 |
| 10398 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10399 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10400 EXPECT_NE(member_id, membership_id(child_raw)); |
| 10401 EXPECT_NE(member_id, membership_id(child_raw->mask_layer())); |
| 10402 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10403 EXPECT_NE(member_id, membership_id(grand_child2_raw)); |
| 10404 |
| 10405 expected.clear(); |
| 10406 actual.clear(); |
| 10407 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10408 EXPECT_EQ(expected, actual); |
| 10409 |
| 10410 // Child itself draws means that we should have the child and the mask in the |
| 10411 // list. |
| 10412 child_raw->SetDrawsContent(true); |
| 10413 |
| 10414 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10415 member_id = render_surface_layer_list_count(); |
| 10416 |
| 10417 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 10418 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 10419 EXPECT_EQ(member_id, membership_id(child_raw)); |
| 10420 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer())); |
| 10421 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 10422 EXPECT_NE(member_id, membership_id(grand_child2_raw)); |
| 10423 |
| 10424 expected.clear(); |
| 10425 expected.insert(child_raw); |
| 10426 expected.insert(child_raw->mask_layer()); |
| 10427 actual.clear(); |
| 10428 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10429 EXPECT_EQ(expected, actual); |
| 10430 |
| 10431 child_raw->TakeMaskLayer(); |
| 10432 |
| 10433 // Now everyone's a member! |
| 10434 grand_parent_raw->SetDrawsContent(true); |
| 10435 parent_raw->SetDrawsContent(true); |
| 10436 child_raw->SetDrawsContent(true); |
| 10437 grand_child1_raw->SetDrawsContent(true); |
| 10438 grand_child2_raw->SetDrawsContent(true); |
| 10439 |
| 10440 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 10441 member_id = render_surface_layer_list_count(); |
| 10442 |
| 10443 EXPECT_EQ(member_id, membership_id(grand_parent_raw)); |
| 10444 EXPECT_EQ(member_id, membership_id(parent_raw)); |
| 10445 EXPECT_EQ(member_id, membership_id(child_raw)); |
| 10446 EXPECT_EQ(member_id, membership_id(grand_child1_raw)); |
| 10447 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); |
| 10448 |
| 10449 expected.clear(); |
| 10450 expected.insert(grand_parent_raw); |
| 10451 expected.insert(parent_raw); |
| 10452 expected.insert(child_raw); |
| 10453 expected.insert(grand_child1_raw); |
| 10454 expected.insert(grand_child2_raw); |
| 10455 |
| 10456 actual.clear(); |
| 10457 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 10458 EXPECT_EQ(expected, actual); |
| 10459 } |
10155 } // namespace | 10460 } // namespace |
10156 } // namespace cc | 10461 } // namespace cc |
OLD | NEW |