| 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/delegated_renderer_layer_impl.h" | 5 #include "cc/delegated_renderer_layer_impl.h" |
| 6 | 6 |
| 7 #include "cc/append_quads_data.h" | 7 #include "cc/append_quads_data.h" |
| 8 #include "cc/layer_tree_host_impl.h" | 8 #include "cc/layer_tree_host_impl.h" |
| 9 #include "cc/layer_tree_impl.h" |
| 9 #include "cc/quad_sink.h" | 10 #include "cc/quad_sink.h" |
| 10 #include "cc/render_pass_draw_quad.h" | 11 #include "cc/render_pass_draw_quad.h" |
| 11 #include "cc/scoped_ptr_vector.h" | 12 #include "cc/scoped_ptr_vector.h" |
| 12 #include "cc/single_thread_proxy.h" | 13 #include "cc/single_thread_proxy.h" |
| 13 #include "cc/solid_color_draw_quad.h" | 14 #include "cc/solid_color_draw_quad.h" |
| 14 #include "cc/solid_color_layer_impl.h" | 15 #include "cc/solid_color_layer_impl.h" |
| 15 #include "cc/test/fake_layer_tree_host_impl.h" | 16 #include "cc/test/fake_layer_tree_host_impl.h" |
| 16 #include "cc/test/fake_layer_tree_host_impl_client.h" | 17 #include "cc/test/fake_layer_tree_host_impl_client.h" |
| 17 #include "cc/test/fake_output_surface.h" | 18 #include "cc/test/fake_output_surface.h" |
| 18 #include "cc/test/fake_proxy.h" | 19 #include "cc/test/fake_proxy.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 m_layerAfterPtr = layerAfter.get(); | 100 m_layerAfterPtr = layerAfter.get(); |
| 100 m_delegatedRendererLayerPtr = delegatedRendererLayer.get(); | 101 m_delegatedRendererLayerPtr = delegatedRendererLayer.get(); |
| 101 | 102 |
| 102 // Force the delegated RenderPasses to come before the RenderPass from l
ayerAfter. | 103 // Force the delegated RenderPasses to come before the RenderPass from l
ayerAfter. |
| 103 layerAfter->addChild(delegatedRendererLayer.PassAs<LayerImpl>()); | 104 layerAfter->addChild(delegatedRendererLayer.PassAs<LayerImpl>()); |
| 104 rootLayer->addChild(layerAfter.Pass()); | 105 rootLayer->addChild(layerAfter.Pass()); |
| 105 | 106 |
| 106 // Get the RenderPass generated by layerBefore to come before the delega
ted RenderPasses. | 107 // Get the RenderPass generated by layerBefore to come before the delega
ted RenderPasses. |
| 107 rootLayer->addChild(layerBefore.Pass()); | 108 rootLayer->addChild(layerBefore.Pass()); |
| 108 | 109 |
| 109 m_hostImpl->setRootLayer(rootLayer.Pass()); | 110 m_hostImpl->activeTree()->SetRootLayer(rootLayer.Pass()); |
| 110 } | 111 } |
| 111 | 112 |
| 112 protected: | 113 protected: |
| 113 LayerImpl* m_rootLayerPtr; | 114 LayerImpl* m_rootLayerPtr; |
| 114 LayerImpl* m_layerBeforePtr; | 115 LayerImpl* m_layerBeforePtr; |
| 115 LayerImpl* m_layerAfterPtr; | 116 LayerImpl* m_layerAfterPtr; |
| 116 DelegatedRendererLayerImpl* m_delegatedRendererLayerPtr; | 117 DelegatedRendererLayerImpl* m_delegatedRendererLayerPtr; |
| 117 }; | 118 }; |
| 118 | 119 |
| 119 TEST_F(DelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses) | 120 TEST_F(DelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses) |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 delegatedRendererLayer->setRenderPasses(delegatedRenderPasses); | 416 delegatedRendererLayer->setRenderPasses(delegatedRenderPasses); |
| 416 | 417 |
| 417 // The RenderPasses should be taken by the layer. | 418 // The RenderPasses should be taken by the layer. |
| 418 EXPECT_EQ(0u, delegatedRenderPasses.size()); | 419 EXPECT_EQ(0u, delegatedRenderPasses.size()); |
| 419 | 420 |
| 420 m_rootLayerPtr = rootLayer.get(); | 421 m_rootLayerPtr = rootLayer.get(); |
| 421 m_delegatedRendererLayerPtr = delegatedRendererLayer.get(); | 422 m_delegatedRendererLayerPtr = delegatedRendererLayer.get(); |
| 422 | 423 |
| 423 rootLayer->addChild(delegatedRendererLayer.PassAs<LayerImpl>()); | 424 rootLayer->addChild(delegatedRendererLayer.PassAs<LayerImpl>()); |
| 424 | 425 |
| 425 m_hostImpl->setRootLayer(rootLayer.Pass()); | 426 m_hostImpl->activeTree()->SetRootLayer(rootLayer.Pass()); |
| 426 } | 427 } |
| 427 | 428 |
| 428 protected: | 429 protected: |
| 429 LayerImpl* m_rootLayerPtr; | 430 LayerImpl* m_rootLayerPtr; |
| 430 DelegatedRendererLayerImpl* m_delegatedRendererLayerPtr; | 431 DelegatedRendererLayerImpl* m_delegatedRendererLayerPtr; |
| 431 }; | 432 }; |
| 432 | 433 |
| 433 TEST_F(DelegatedRendererLayerImplTestSharedData, SharedData) | 434 TEST_F(DelegatedRendererLayerImplTestSharedData, SharedData) |
| 434 { | 435 { |
| 435 LayerTreeHostImpl::FrameData frame; | 436 LayerTreeHostImpl::FrameData frame; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 453 gfx::Transform expected; | 454 gfx::Transform expected; |
| 454 expected.Translate(30, 30); | 455 expected.Translate(30, 30); |
| 455 EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->content_to_target_tra
nsform); | 456 EXPECT_TRANSFORMATION_MATRIX_EQ(expected, sharedState->content_to_target_tra
nsform); |
| 456 | 457 |
| 457 m_hostImpl->drawLayers(frame); | 458 m_hostImpl->drawLayers(frame); |
| 458 m_hostImpl->didDrawAllLayers(frame); | 459 m_hostImpl->didDrawAllLayers(frame); |
| 459 } | 460 } |
| 460 | 461 |
| 461 } // namespace | 462 } // namespace |
| 462 } // namespace cc | 463 } // namespace cc |
| OLD | NEW |