Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layers/delegated_renderer_layer_impl.h" | 5 #include "cc/layers/delegated_renderer_layer_impl.h" |
| 6 | 6 |
| 7 #include "cc/base/scoped_ptr_vector.h" | 7 #include "cc/base/scoped_ptr_vector.h" |
| 8 #include "cc/layers/solid_color_layer_impl.h" | 8 #include "cc/layers/solid_color_layer_impl.h" |
| 9 #include "cc/quads/render_pass_draw_quad.h" | 9 #include "cc/quads/render_pass_draw_quad.h" |
| 10 #include "cc/quads/solid_color_draw_quad.h" | 10 #include "cc/quads/solid_color_draw_quad.h" |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 304 EXPECT_FALSE(delegated_renderer_layer_->render_surface()); | 304 EXPECT_FALSE(delegated_renderer_layer_->render_surface()); |
| 305 | 305 |
| 306 host_impl_->DrawLayers(&frame); | 306 host_impl_->DrawLayers(&frame); |
| 307 host_impl_->DidDrawAllLayers(frame); | 307 host_impl_->DidDrawAllLayers(frame); |
| 308 } | 308 } |
| 309 | 309 |
| 310 TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) { | 310 TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) { |
| 311 delegated_renderer_layer_->SetOpacity(0.5f); | 311 delegated_renderer_layer_->SetOpacity(0.5f); |
| 312 | 312 |
| 313 LayerTreeHostImpl::FrameData frame; | 313 LayerTreeHostImpl::FrameData frame; |
| 314 FakeLayerTreeHostImpl::UpdateNumChildrenAndDrawProperties( | |
|
danakj
2014/08/06 14:57:07
PrepareToDraw does an UpdateDrawProperties, how co
awoloszyn
2014/08/08 15:53:20
I think the DrawProperties was overkill, I have ch
| |
| 315 host_impl_->active_tree()); | |
| 314 EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame)); | 316 EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame)); |
| 315 | 317 |
| 316 // This test case has quads from multiple layers in the delegated renderer, so | 318 // This test case has quads from multiple layers in the delegated renderer, so |
| 317 // if the DelegatedRendererLayer has opacity < 1, it should end up with a | 319 // if the DelegatedRendererLayer has opacity < 1, it should end up with a |
| 318 // render surface. | 320 // render surface. |
| 319 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); | 321 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); |
| 320 | 322 |
| 321 host_impl_->DrawLayers(&frame); | 323 host_impl_->DrawLayers(&frame); |
| 322 host_impl_->DidDrawAllLayers(frame); | 324 host_impl_->DidDrawAllLayers(frame); |
| 323 } | 325 } |
| 324 | 326 |
| 325 TEST_F(DelegatedRendererLayerImplTestSimple, | 327 TEST_F(DelegatedRendererLayerImplTestSimple, |
| 326 DoesOwnARenderSurfaceForTransform) { | 328 DoesOwnARenderSurfaceForTransform) { |
| 327 gfx::Transform rotation; | 329 gfx::Transform rotation; |
| 328 rotation.RotateAboutZAxis(30.0); | 330 rotation.RotateAboutZAxis(30.0); |
| 329 delegated_renderer_layer_->SetTransform(rotation); | 331 delegated_renderer_layer_->SetTransform(rotation); |
| 330 | 332 |
| 331 LayerTreeHostImpl::FrameData frame; | 333 LayerTreeHostImpl::FrameData frame; |
| 334 FakeLayerTreeHostImpl::RecursiveUpdateNumChildren( | |
| 335 host_impl_->active_tree()->root_layer()); | |
| 332 EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame)); | 336 EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame)); |
| 333 | 337 |
| 334 // This test case has quads from multiple layers in the delegated renderer, so | 338 // This test case has quads from multiple layers in the delegated renderer, so |
| 335 // if the DelegatedRendererLayer has opacity < 1, it should end up with a | 339 // if the DelegatedRendererLayer has opacity < 1, it should end up with a |
| 336 // render surface. | 340 // render surface. |
| 337 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); | 341 EXPECT_TRUE(delegated_renderer_layer_->render_surface()); |
| 338 | 342 |
| 339 host_impl_->DrawLayers(&frame); | 343 host_impl_->DrawLayers(&frame); |
| 340 host_impl_->DidDrawAllLayers(frame); | 344 host_impl_->DidDrawAllLayers(frame); |
| 341 } | 345 } |
| (...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1532 scoped_ptr<DelegatedRendererLayerImpl> other_layer = | 1536 scoped_ptr<DelegatedRendererLayerImpl> other_layer = |
| 1533 DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6); | 1537 DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6); |
| 1534 | 1538 |
| 1535 delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get()); | 1539 delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get()); |
| 1536 | 1540 |
| 1537 EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor()); | 1541 EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor()); |
| 1538 } | 1542 } |
| 1539 | 1543 |
| 1540 } // namespace | 1544 } // namespace |
| 1541 } // namespace cc | 1545 } // namespace cc |
| OLD | NEW |