| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/delegating_renderer.h" | 5 #include "cc/delegating_renderer.h" |
| 6 | 6 |
| 7 #include "cc/test/fake_output_surface.h" | 7 #include "cc/test/fake_output_surface.h" |
| 8 #include "cc/test/layer_tree_test_common.h" | 8 #include "cc/test/layer_tree_test_common.h" |
| 9 #include "cc/test/render_pass_test_common.h" | 9 #include "cc/test/render_pass_test_common.h" |
| 10 #include "cc/test/render_pass_test_utils.h" | 10 #include "cc/test/render_pass_test_utils.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 class DelegatingRendererTestDraw : public DelegatingRendererTest { | 37 class DelegatingRendererTestDraw : public DelegatingRendererTest { |
| 38 public: | 38 public: |
| 39 virtual void beginTest() OVERRIDE { | 39 virtual void beginTest() OVERRIDE { |
| 40 m_layerTreeHost->SetPageScaleFactorAndLimits(1.f, 0.5f, 4.f); | 40 m_layerTreeHost->SetPageScaleFactorAndLimits(1.f, 0.5f, 4.f); |
| 41 postSetNeedsCommitToMainThread(); | 41 postSetNeedsCommitToMainThread(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 virtual void afterTest() OVERRIDE {} | 44 virtual void afterTest() OVERRIDE {} |
| 45 | 45 |
| 46 virtual bool prepareToDrawOnThread( | 46 virtual bool prepareToDrawOnThread( |
| 47 LayerTreeHostImpl*, LayerTreeHostImpl::FrameData& frame, bool result) | 47 LayerTreeHostImpl*, LayerTreeHostImpl::FrameData* frame, bool result) |
| 48 OVERRIDE { | 48 OVERRIDE { |
| 49 EXPECT_EQ(0u, output_surface_->num_sent_frames()); | 49 EXPECT_EQ(0u, output_surface_->num_sent_frames()); |
| 50 | 50 |
| 51 CompositorFrame& last_frame = output_surface_->last_sent_frame(); | 51 CompositorFrame& last_frame = output_surface_->last_sent_frame(); |
| 52 EXPECT_FALSE(last_frame.delegated_frame_data); | 52 EXPECT_FALSE(last_frame.delegated_frame_data); |
| 53 EXPECT_FALSE(last_frame.gl_frame_data); | 53 EXPECT_FALSE(last_frame.gl_frame_data); |
| 54 EXPECT_EQ(0.f, last_frame.metadata.min_page_scale_factor); | 54 EXPECT_EQ(0.f, last_frame.metadata.min_page_scale_factor); |
| 55 EXPECT_EQ(0.f, last_frame.metadata.max_page_scale_factor); | 55 EXPECT_EQ(0.f, last_frame.metadata.max_page_scale_factor); |
| 56 return true; | 56 return true; |
| 57 } | 57 } |
| 58 | 58 |
| 59 virtual void drawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { | 59 virtual void drawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { |
| 60 EXPECT_EQ(1u, output_surface_->num_sent_frames()); | 60 EXPECT_EQ(1u, output_surface_->num_sent_frames()); |
| 61 | 61 |
| 62 CompositorFrame& last_frame = output_surface_->last_sent_frame(); | 62 CompositorFrame& last_frame = output_surface_->last_sent_frame(); |
| 63 DelegatedFrameData* last_frame_data = last_frame.delegated_frame_data.get(); | 63 DelegatedFrameData* last_frame_data = last_frame.delegated_frame_data.get(); |
| 64 ASSERT_TRUE(last_frame.delegated_frame_data); | 64 ASSERT_TRUE(last_frame.delegated_frame_data); |
| 65 EXPECT_FALSE(last_frame.gl_frame_data); | 65 EXPECT_FALSE(last_frame.gl_frame_data); |
| 66 EXPECT_EQ( | 66 EXPECT_EQ( |
| 67 gfx::Rect(host_impl->DeviceViewportSize()).ToString(), | 67 gfx::Rect(host_impl->device_viewport_size()).ToString(), |
| 68 last_frame_data->render_pass_list.back()->output_rect.ToString()); | 68 last_frame_data->render_pass_list.back()->output_rect.ToString()); |
| 69 EXPECT_EQ(0.5f, last_frame.metadata.min_page_scale_factor); | 69 EXPECT_EQ(0.5f, last_frame.metadata.min_page_scale_factor); |
| 70 EXPECT_EQ(4.f, last_frame.metadata.max_page_scale_factor); | 70 EXPECT_EQ(4.f, last_frame.metadata.max_page_scale_factor); |
| 71 | 71 |
| 72 EXPECT_EQ( | 72 EXPECT_EQ( |
| 73 0u, last_frame.delegated_frame_data->resource_list.size()); | 73 0u, last_frame.delegated_frame_data->resource_list.size()); |
| 74 EXPECT_EQ(1u, last_frame.delegated_frame_data->render_pass_list.size()); | 74 EXPECT_EQ(1u, last_frame.delegated_frame_data->render_pass_list.size()); |
| 75 | 75 |
| 76 endTest(); | 76 endTest(); |
| 77 } | 77 } |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestDraw) | 80 SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestDraw) |
| 81 | 81 |
| 82 class DelegatingRendererTestResources : public DelegatingRendererTest { | 82 class DelegatingRendererTestResources : public DelegatingRendererTest { |
| 83 public: | 83 public: |
| 84 virtual void beginTest() OVERRIDE { | 84 virtual void beginTest() OVERRIDE { |
| 85 postSetNeedsCommitToMainThread(); | 85 postSetNeedsCommitToMainThread(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 virtual void afterTest() OVERRIDE {} | 88 virtual void afterTest() OVERRIDE {} |
| 89 | 89 |
| 90 virtual bool prepareToDrawOnThread( | 90 virtual bool prepareToDrawOnThread( |
| 91 LayerTreeHostImpl* host_impl, | 91 LayerTreeHostImpl* host_impl, |
| 92 LayerTreeHostImpl::FrameData& frame, | 92 LayerTreeHostImpl::FrameData* frame, |
| 93 bool result) OVERRIDE { | 93 bool result) OVERRIDE { |
| 94 | 94 |
| 95 frame.renderPasses.clear(); | 95 frame->render_passes.clear(); |
| 96 frame.renderPassesById.clear(); | 96 frame->render_passes_by_id.clear(); |
| 97 | 97 |
| 98 TestRenderPass* child_pass = addRenderPass( | 98 TestRenderPass* child_pass = addRenderPass( |
| 99 frame.renderPasses, | 99 frame->render_passes, |
| 100 RenderPass::Id(2, 1), | 100 RenderPass::Id(2, 1), |
| 101 gfx::Rect(3, 3, 10, 10), | 101 gfx::Rect(3, 3, 10, 10), |
| 102 gfx::Transform()); | 102 gfx::Transform()); |
| 103 child_pass->AppendOneOfEveryQuadType( | 103 child_pass->AppendOneOfEveryQuadType( |
| 104 host_impl->resourceProvider(), RenderPass::Id(0, 0)); | 104 host_impl->resource_provider(), RenderPass::Id(0, 0)); |
| 105 | 105 |
| 106 TestRenderPass* pass = addRenderPass( | 106 TestRenderPass* pass = addRenderPass( |
| 107 frame.renderPasses, | 107 frame->render_passes, |
| 108 RenderPass::Id(1, 1), | 108 RenderPass::Id(1, 1), |
| 109 gfx::Rect(3, 3, 10, 10), | 109 gfx::Rect(3, 3, 10, 10), |
| 110 gfx::Transform()); | 110 gfx::Transform()); |
| 111 pass->AppendOneOfEveryQuadType( | 111 pass->AppendOneOfEveryQuadType( |
| 112 host_impl->resourceProvider(), child_pass->id); | 112 host_impl->resource_provider(), child_pass->id); |
| 113 return true; | 113 return true; |
| 114 } | 114 } |
| 115 | 115 |
| 116 virtual void drawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { | 116 virtual void drawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE { |
| 117 EXPECT_EQ(1u, output_surface_->num_sent_frames()); | 117 EXPECT_EQ(1u, output_surface_->num_sent_frames()); |
| 118 | 118 |
| 119 CompositorFrame& last_frame = output_surface_->last_sent_frame(); | 119 CompositorFrame& last_frame = output_surface_->last_sent_frame(); |
| 120 ASSERT_TRUE(last_frame.delegated_frame_data); | 120 ASSERT_TRUE(last_frame.delegated_frame_data); |
| 121 | 121 |
| 122 EXPECT_EQ(2u, last_frame.delegated_frame_data->render_pass_list.size()); | 122 EXPECT_EQ(2u, last_frame.delegated_frame_data->render_pass_list.size()); |
| 123 // Each render pass has 7 resources in it. And the root render pass has a | 123 // Each render pass has 7 resources in it. And the root render pass has a |
| 124 // mask resource used when drawing the child render pass. The number 7 may | 124 // mask resource used when drawing the child render pass. The number 7 may |
| 125 // change if AppendOneOfEveryQuadType is updated, and the value here should | 125 // change if AppendOneOfEveryQuadType is updated, and the value here should |
| 126 // be updated accordingly. | 126 // be updated accordingly. |
| 127 EXPECT_EQ( | 127 EXPECT_EQ( |
| 128 15u, last_frame.delegated_frame_data->resource_list.size()); | 128 15u, last_frame.delegated_frame_data->resource_list.size()); |
| 129 | 129 |
| 130 endTest(); | 130 endTest(); |
| 131 } | 131 } |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestResources) | 134 SINGLE_AND_MULTI_THREAD_TEST_F(DelegatingRendererTestResources) |
| 135 | 135 |
| 136 } // namespace cc | 136 } // namespace cc |
| OLD | NEW |