| 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" |
| 11 #include "cc/test/fake_delegated_renderer_layer_impl.h" | 11 #include "cc/test/fake_delegated_renderer_layer_impl.h" |
| 12 #include "cc/test/fake_impl_proxy.h" | 12 #include "cc/test/fake_impl_proxy.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_layer_tree_host_impl_client.h" | 14 #include "cc/test/fake_layer_tree_host_impl_client.h" |
| 15 #include "cc/test/fake_output_surface.h" | 15 #include "cc/test/fake_output_surface.h" |
| 16 #include "cc/test/geometry_test_utils.h" | 16 #include "cc/test/geometry_test_utils.h" |
| 17 #include "cc/test/layer_test_common.h" | 17 #include "cc/test/layer_test_common.h" |
| 18 #include "cc/test/render_pass_test_common.h" | 18 #include "cc/test/render_pass_test_common.h" |
| 19 #include "cc/test/render_pass_test_utils.h" | 19 #include "cc/test/render_pass_test_utils.h" |
| 20 #include "cc/test/test_shared_bitmap_manager.h" | 20 #include "cc/test/test_shared_bitmap_manager.h" |
| 21 #include "cc/test/test_task_graph_runner.h" |
| 21 #include "cc/test/test_web_graphics_context_3d.h" | 22 #include "cc/test/test_web_graphics_context_3d.h" |
| 22 #include "cc/trees/layer_tree_host_impl.h" | 23 #include "cc/trees/layer_tree_host_impl.h" |
| 23 #include "cc/trees/layer_tree_impl.h" | 24 #include "cc/trees/layer_tree_impl.h" |
| 24 #include "cc/trees/single_thread_proxy.h" | 25 #include "cc/trees/single_thread_proxy.h" |
| 25 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| 26 #include "ui/gfx/frame_time.h" | 27 #include "ui/gfx/frame_time.h" |
| 27 #include "ui/gfx/transform.h" | 28 #include "ui/gfx/transform.h" |
| 28 | 29 |
| 29 namespace cc { | 30 namespace cc { |
| 30 namespace { | 31 namespace { |
| 31 | 32 |
| 32 class DelegatedRendererLayerImplTest : public testing::Test { | 33 class DelegatedRendererLayerImplTest : public testing::Test { |
| 33 public: | 34 public: |
| 34 DelegatedRendererLayerImplTest() | 35 DelegatedRendererLayerImplTest() |
| 35 : proxy_(), | 36 : proxy_(), |
| 36 always_impl_thread_and_main_thread_blocked_(&proxy_) { | 37 always_impl_thread_and_main_thread_blocked_(&proxy_) { |
| 37 LayerTreeSettings settings; | 38 LayerTreeSettings settings; |
| 38 settings.minimum_occlusion_tracking_size = gfx::Size(); | 39 settings.minimum_occlusion_tracking_size = gfx::Size(); |
| 39 | 40 |
| 40 host_impl_.reset( | 41 host_impl_.reset(new FakeLayerTreeHostImpl( |
| 41 new FakeLayerTreeHostImpl(settings, &proxy_, &shared_bitmap_manager_)); | 42 settings, &proxy_, &shared_bitmap_manager_, &task_graph_runner_)); |
| 42 host_impl_->InitializeRenderer(FakeOutputSurface::Create3d()); | 43 host_impl_->InitializeRenderer(FakeOutputSurface::Create3d()); |
| 43 host_impl_->SetViewportSize(gfx::Size(10, 10)); | 44 host_impl_->SetViewportSize(gfx::Size(10, 10)); |
| 44 } | 45 } |
| 45 | 46 |
| 46 protected: | 47 protected: |
| 47 FakeImplProxy proxy_; | 48 FakeImplProxy proxy_; |
| 48 DebugScopedSetImplThreadAndMainThreadBlocked | 49 DebugScopedSetImplThreadAndMainThreadBlocked |
| 49 always_impl_thread_and_main_thread_blocked_; | 50 always_impl_thread_and_main_thread_blocked_; |
| 50 TestSharedBitmapManager shared_bitmap_manager_; | 51 TestSharedBitmapManager shared_bitmap_manager_; |
| 52 TestTaskGraphRunner task_graph_runner_; |
| 51 scoped_ptr<LayerTreeHostImpl> host_impl_; | 53 scoped_ptr<LayerTreeHostImpl> host_impl_; |
| 52 }; | 54 }; |
| 53 | 55 |
| 54 class DelegatedRendererLayerImplTestSimple | 56 class DelegatedRendererLayerImplTestSimple |
| 55 : public DelegatedRendererLayerImplTest { | 57 : public DelegatedRendererLayerImplTest { |
| 56 public: | 58 public: |
| 57 DelegatedRendererLayerImplTestSimple() | 59 DelegatedRendererLayerImplTestSimple() |
| 58 : DelegatedRendererLayerImplTest() { | 60 : DelegatedRendererLayerImplTest() { |
| 59 scoped_ptr<LayerImpl> root_layer = | 61 scoped_ptr<LayerImpl> root_layer = |
| 60 SolidColorLayerImpl::Create(host_impl_->active_tree(), 1); | 62 SolidColorLayerImpl::Create(host_impl_->active_tree(), 1); |
| (...skipping 1616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1677 scoped_ptr<DelegatedRendererLayerImpl> other_layer = | 1679 scoped_ptr<DelegatedRendererLayerImpl> other_layer = |
| 1678 DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6); | 1680 DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6); |
| 1679 | 1681 |
| 1680 delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get()); | 1682 delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get()); |
| 1681 | 1683 |
| 1682 EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor()); | 1684 EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor()); |
| 1683 } | 1685 } |
| 1684 | 1686 |
| 1685 } // namespace | 1687 } // namespace |
| 1686 } // namespace cc | 1688 } // namespace cc |
| OLD | NEW |