| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "cc/layers/append_quads_data.h" | 7 #include "cc/layers/append_quads_data.h" |
| 8 #include "cc/layers/ui_resource_layer_impl.h" | 8 #include "cc/layers/ui_resource_layer_impl.h" |
| 9 #include "cc/quads/draw_quad.h" | 9 #include "cc/quads/draw_quad.h" |
| 10 #include "cc/resources/ui_resource_bitmap.h" | 10 #include "cc/resources/ui_resource_bitmap.h" |
| 11 #include "cc/resources/ui_resource_client.h" | 11 #include "cc/resources/ui_resource_client.h" |
| 12 #include "cc/test/fake_impl_task_runner_provider.h" | 12 #include "cc/test/fake_impl_task_runner_provider.h" |
| 13 #include "cc/test/fake_layer_tree_host_impl.h" | 13 #include "cc/test/fake_layer_tree_host_impl.h" |
| 14 #include "cc/test/fake_output_surface.h" | 14 #include "cc/test/fake_output_surface.h" |
| 15 #include "cc/test/fake_ui_resource_layer_tree_host_impl.h" | 15 #include "cc/test/fake_ui_resource_layer_tree_host_impl.h" |
| 16 #include "cc/test/layer_test_common.h" | 16 #include "cc/test/layer_test_common.h" |
| 17 #include "cc/test/test_shared_bitmap_manager.h" | 17 #include "cc/test/test_shared_bitmap_manager.h" |
| 18 #include "cc/test/test_task_graph_runner.h" | 18 #include "cc/test/test_task_graph_runner.h" |
| 19 #include "cc/trees/single_thread_proxy.h" | 19 #include "cc/trees/single_thread_proxy.h" |
| 20 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 #include "ui/gfx/transform.h" | 22 #include "ui/gfx/transform.h" |
| 23 | 23 |
| 24 namespace cc { | 24 namespace cc { |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 scoped_ptr<UIResourceLayerImpl> GenerateUIResourceLayer( | 27 std::unique_ptr<UIResourceLayerImpl> GenerateUIResourceLayer( |
| 28 FakeUIResourceLayerTreeHostImpl* host_impl, | 28 FakeUIResourceLayerTreeHostImpl* host_impl, |
| 29 const gfx::Size& bitmap_size, | 29 const gfx::Size& bitmap_size, |
| 30 const gfx::Size& layer_size, | 30 const gfx::Size& layer_size, |
| 31 bool opaque, | 31 bool opaque, |
| 32 UIResourceId uid) { | 32 UIResourceId uid) { |
| 33 gfx::Rect visible_layer_rect(layer_size); | 33 gfx::Rect visible_layer_rect(layer_size); |
| 34 scoped_ptr<UIResourceLayerImpl> layer = | 34 std::unique_ptr<UIResourceLayerImpl> layer = |
| 35 UIResourceLayerImpl::Create(host_impl->active_tree(), 1); | 35 UIResourceLayerImpl::Create(host_impl->active_tree(), 1); |
| 36 layer->draw_properties().visible_layer_rect = visible_layer_rect; | 36 layer->draw_properties().visible_layer_rect = visible_layer_rect; |
| 37 layer->SetBounds(layer_size); | 37 layer->SetBounds(layer_size); |
| 38 layer->SetForceRenderSurface(true); | 38 layer->SetForceRenderSurface(true); |
| 39 layer->draw_properties().render_target = layer.get(); | 39 layer->draw_properties().render_target = layer.get(); |
| 40 | 40 |
| 41 UIResourceBitmap bitmap(bitmap_size, opaque); | 41 UIResourceBitmap bitmap(bitmap_size, opaque); |
| 42 | 42 |
| 43 host_impl->CreateUIResource(uid, bitmap); | 43 host_impl->CreateUIResource(uid, bitmap); |
| 44 layer->SetUIResourceId(uid); | 44 layer->SetUIResourceId(uid); |
| 45 | 45 |
| 46 return layer; | 46 return layer; |
| 47 } | 47 } |
| 48 | 48 |
| 49 void QuadSizeTest(scoped_ptr<UIResourceLayerImpl> layer, | 49 void QuadSizeTest(std::unique_ptr<UIResourceLayerImpl> layer, |
| 50 size_t expected_quad_size) { | 50 size_t expected_quad_size) { |
| 51 scoped_ptr<RenderPass> render_pass = RenderPass::Create(); | 51 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); |
| 52 | 52 |
| 53 AppendQuadsData data; | 53 AppendQuadsData data; |
| 54 layer->AppendQuads(render_pass.get(), &data); | 54 layer->AppendQuads(render_pass.get(), &data); |
| 55 | 55 |
| 56 // Verify quad rects | 56 // Verify quad rects |
| 57 const QuadList& quads = render_pass->quad_list; | 57 const QuadList& quads = render_pass->quad_list; |
| 58 EXPECT_EQ(expected_quad_size, quads.size()); | 58 EXPECT_EQ(expected_quad_size, quads.size()); |
| 59 } | 59 } |
| 60 | 60 |
| 61 TEST(UIResourceLayerImplTest, VerifyDrawQuads) { | 61 TEST(UIResourceLayerImplTest, VerifyDrawQuads) { |
| 62 FakeImplTaskRunnerProvider task_runner_provider; | 62 FakeImplTaskRunnerProvider task_runner_provider; |
| 63 TestSharedBitmapManager shared_bitmap_manager; | 63 TestSharedBitmapManager shared_bitmap_manager; |
| 64 TestTaskGraphRunner task_graph_runner; | 64 TestTaskGraphRunner task_graph_runner; |
| 65 scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); | 65 std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); |
| 66 FakeUIResourceLayerTreeHostImpl host_impl( | 66 FakeUIResourceLayerTreeHostImpl host_impl( |
| 67 &task_runner_provider, &shared_bitmap_manager, &task_graph_runner); | 67 &task_runner_provider, &shared_bitmap_manager, &task_graph_runner); |
| 68 host_impl.SetVisible(true); | 68 host_impl.SetVisible(true); |
| 69 host_impl.InitializeRenderer(output_surface.get()); | 69 host_impl.InitializeRenderer(output_surface.get()); |
| 70 | 70 |
| 71 // Make sure we're appending quads when there are valid values. | 71 // Make sure we're appending quads when there are valid values. |
| 72 gfx::Size bitmap_size(100, 100); | 72 gfx::Size bitmap_size(100, 100); |
| 73 gfx::Size layer_size(100, 100); | 73 gfx::Size layer_size(100, 100); |
| 74 size_t expected_quad_size = 1; | 74 size_t expected_quad_size = 1; |
| 75 bool opaque = true; | 75 bool opaque = true; |
| 76 UIResourceId uid = 1; | 76 UIResourceId uid = 1; |
| 77 scoped_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer(&host_impl, | 77 std::unique_ptr<UIResourceLayerImpl> layer = |
| 78 bitmap_size, | 78 GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size, opaque, uid); |
| 79 layer_size, | |
| 80 opaque, | |
| 81 uid); | |
| 82 QuadSizeTest(std::move(layer), expected_quad_size); | 79 QuadSizeTest(std::move(layer), expected_quad_size); |
| 83 | 80 |
| 84 // Make sure we're not appending quads when there are invalid values. | 81 // Make sure we're not appending quads when there are invalid values. |
| 85 expected_quad_size = 0; | 82 expected_quad_size = 0; |
| 86 uid = 0; | 83 uid = 0; |
| 87 layer = GenerateUIResourceLayer(&host_impl, | 84 layer = GenerateUIResourceLayer(&host_impl, |
| 88 bitmap_size, | 85 bitmap_size, |
| 89 layer_size, | 86 layer_size, |
| 90 opaque, | 87 opaque, |
| 91 uid); | 88 uid); |
| 92 QuadSizeTest(std::move(layer), expected_quad_size); | 89 QuadSizeTest(std::move(layer), expected_quad_size); |
| 93 } | 90 } |
| 94 | 91 |
| 95 void OpaqueBoundsTest(scoped_ptr<UIResourceLayerImpl> layer, | 92 void OpaqueBoundsTest(std::unique_ptr<UIResourceLayerImpl> layer, |
| 96 const gfx::Rect& expected_opaque_bounds) { | 93 const gfx::Rect& expected_opaque_bounds) { |
| 97 scoped_ptr<RenderPass> render_pass = RenderPass::Create(); | 94 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); |
| 98 | 95 |
| 99 AppendQuadsData data; | 96 AppendQuadsData data; |
| 100 layer->AppendQuads(render_pass.get(), &data); | 97 layer->AppendQuads(render_pass.get(), &data); |
| 101 | 98 |
| 102 // Verify quad rects | 99 // Verify quad rects |
| 103 const QuadList& quads = render_pass->quad_list; | 100 const QuadList& quads = render_pass->quad_list; |
| 104 EXPECT_GE(quads.size(), (size_t)0); | 101 EXPECT_GE(quads.size(), (size_t)0); |
| 105 gfx::Rect opaque_rect = quads.front()->opaque_rect; | 102 gfx::Rect opaque_rect = quads.front()->opaque_rect; |
| 106 EXPECT_EQ(expected_opaque_bounds, opaque_rect); | 103 EXPECT_EQ(expected_opaque_bounds, opaque_rect); |
| 107 } | 104 } |
| 108 | 105 |
| 109 TEST(UIResourceLayerImplTest, VerifySetOpaqueOnSkBitmap) { | 106 TEST(UIResourceLayerImplTest, VerifySetOpaqueOnSkBitmap) { |
| 110 FakeImplTaskRunnerProvider task_runner_provider; | 107 FakeImplTaskRunnerProvider task_runner_provider; |
| 111 TestSharedBitmapManager shared_bitmap_manager; | 108 TestSharedBitmapManager shared_bitmap_manager; |
| 112 TestTaskGraphRunner task_graph_runner; | 109 TestTaskGraphRunner task_graph_runner; |
| 113 scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); | 110 std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); |
| 114 FakeUIResourceLayerTreeHostImpl host_impl( | 111 FakeUIResourceLayerTreeHostImpl host_impl( |
| 115 &task_runner_provider, &shared_bitmap_manager, &task_graph_runner); | 112 &task_runner_provider, &shared_bitmap_manager, &task_graph_runner); |
| 116 host_impl.SetVisible(true); | 113 host_impl.SetVisible(true); |
| 117 host_impl.InitializeRenderer(output_surface.get()); | 114 host_impl.InitializeRenderer(output_surface.get()); |
| 118 | 115 |
| 119 gfx::Size bitmap_size(100, 100); | 116 gfx::Size bitmap_size(100, 100); |
| 120 gfx::Size layer_size(100, 100); | 117 gfx::Size layer_size(100, 100); |
| 121 bool opaque = false; | 118 bool opaque = false; |
| 122 UIResourceId uid = 1; | 119 UIResourceId uid = 1; |
| 123 scoped_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer(&host_impl, | 120 std::unique_ptr<UIResourceLayerImpl> layer = |
| 124 bitmap_size, | 121 GenerateUIResourceLayer(&host_impl, bitmap_size, layer_size, opaque, uid); |
| 125 layer_size, | |
| 126 opaque, | |
| 127 uid); | |
| 128 gfx::Rect expected_opaque_bounds; | 122 gfx::Rect expected_opaque_bounds; |
| 129 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); | 123 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); |
| 130 | 124 |
| 131 opaque = true; | 125 opaque = true; |
| 132 layer = GenerateUIResourceLayer(&host_impl, | 126 layer = GenerateUIResourceLayer(&host_impl, |
| 133 bitmap_size, | 127 bitmap_size, |
| 134 layer_size, | 128 layer_size, |
| 135 opaque, | 129 opaque, |
| 136 uid); | 130 uid); |
| 137 expected_opaque_bounds = gfx::Rect(layer->bounds()); | 131 expected_opaque_bounds = gfx::Rect(layer->bounds()); |
| 138 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); | 132 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); |
| 139 } | 133 } |
| 140 | 134 |
| 141 TEST(UIResourceLayerImplTest, VerifySetOpaqueOnLayer) { | 135 TEST(UIResourceLayerImplTest, VerifySetOpaqueOnLayer) { |
| 142 FakeImplTaskRunnerProvider task_runner_provider; | 136 FakeImplTaskRunnerProvider task_runner_provider; |
| 143 TestSharedBitmapManager shared_bitmap_manager; | 137 TestSharedBitmapManager shared_bitmap_manager; |
| 144 TestTaskGraphRunner task_graph_runner; | 138 TestTaskGraphRunner task_graph_runner; |
| 145 scoped_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); | 139 std::unique_ptr<OutputSurface> output_surface = FakeOutputSurface::Create3d(); |
| 146 FakeUIResourceLayerTreeHostImpl host_impl( | 140 FakeUIResourceLayerTreeHostImpl host_impl( |
| 147 &task_runner_provider, &shared_bitmap_manager, &task_graph_runner); | 141 &task_runner_provider, &shared_bitmap_manager, &task_graph_runner); |
| 148 host_impl.SetVisible(true); | 142 host_impl.SetVisible(true); |
| 149 host_impl.InitializeRenderer(output_surface.get()); | 143 host_impl.InitializeRenderer(output_surface.get()); |
| 150 | 144 |
| 151 gfx::Size bitmap_size(100, 100); | 145 gfx::Size bitmap_size(100, 100); |
| 152 gfx::Size layer_size(100, 100); | 146 gfx::Size layer_size(100, 100); |
| 153 bool skbitmap_opaque = false; | 147 bool skbitmap_opaque = false; |
| 154 UIResourceId uid = 1; | 148 UIResourceId uid = 1; |
| 155 scoped_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer( | 149 std::unique_ptr<UIResourceLayerImpl> layer = GenerateUIResourceLayer( |
| 156 &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid); | 150 &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid); |
| 157 layer->SetContentsOpaque(false); | 151 layer->SetContentsOpaque(false); |
| 158 gfx::Rect expected_opaque_bounds; | 152 gfx::Rect expected_opaque_bounds; |
| 159 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); | 153 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); |
| 160 | 154 |
| 161 layer = GenerateUIResourceLayer( | 155 layer = GenerateUIResourceLayer( |
| 162 &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid); | 156 &host_impl, bitmap_size, layer_size, skbitmap_opaque, uid); |
| 163 layer->SetContentsOpaque(true); | 157 layer->SetContentsOpaque(true); |
| 164 expected_opaque_bounds = gfx::Rect(layer->bounds()); | 158 expected_opaque_bounds = gfx::Rect(layer->bounds()); |
| 165 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); | 159 OpaqueBoundsTest(std::move(layer), expected_opaque_bounds); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 LayerTestCommon::VerifyQuadsAreOccluded( | 208 LayerTestCommon::VerifyQuadsAreOccluded( |
| 215 impl.quad_list(), occluded, &partially_occluded_count); | 209 impl.quad_list(), occluded, &partially_occluded_count); |
| 216 // The layer outputs one quad, which is partially occluded. | 210 // The layer outputs one quad, which is partially occluded. |
| 217 EXPECT_EQ(1u, impl.quad_list().size()); | 211 EXPECT_EQ(1u, impl.quad_list().size()); |
| 218 EXPECT_EQ(1u, partially_occluded_count); | 212 EXPECT_EQ(1u, partially_occluded_count); |
| 219 } | 213 } |
| 220 } | 214 } |
| 221 | 215 |
| 222 } // namespace | 216 } // namespace |
| 223 } // namespace cc | 217 } // namespace cc |
| OLD | NEW |