| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.h" | 5 #include "cc/layers/delegated_renderer_layer.h" |
| 6 | 6 |
| 7 #include "cc/layers/delegated_frame_provider.h" | 7 #include "cc/layers/delegated_frame_provider.h" |
| 8 #include "cc/layers/delegated_frame_resource_collection.h" | 8 #include "cc/layers/delegated_frame_resource_collection.h" |
| 9 #include "cc/layers/solid_color_layer.h" | 9 #include "cc/layers/solid_color_layer.h" |
| 10 #include "cc/output/delegated_frame_data.h" | 10 #include "cc/output/delegated_frame_data.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 scoped_ptr<LayerTreeHost> host_impl_; | 36 scoped_ptr<LayerTreeHost> host_impl_; |
| 37 }; | 37 }; |
| 38 | 38 |
| 39 class DelegatedRendererLayerTestSimple : public DelegatedRendererLayerTest { | 39 class DelegatedRendererLayerTestSimple : public DelegatedRendererLayerTest { |
| 40 public: | 40 public: |
| 41 DelegatedRendererLayerTestSimple() : DelegatedRendererLayerTest() { | 41 DelegatedRendererLayerTestSimple() : DelegatedRendererLayerTest() { |
| 42 scoped_ptr<RenderPass> root_pass(RenderPass::Create()); | 42 scoped_ptr<RenderPass> root_pass(RenderPass::Create()); |
| 43 root_pass->SetNew( | 43 root_pass->SetNew( |
| 44 RenderPassId(1, 1), gfx::Rect(1, 1), gfx::Rect(1, 1), gfx::Transform()); | 44 RenderPassId(1, 1), gfx::Rect(1, 1), gfx::Rect(1, 1), gfx::Transform()); |
| 45 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); | 45 scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
| 46 frame_data->render_pass_list.push_back(root_pass.Pass()); | 46 frame_data->render_pass_list.push_back(std::move(root_pass)); |
| 47 resources_ = new DelegatedFrameResourceCollection; | 47 resources_ = new DelegatedFrameResourceCollection; |
| 48 provider_ = new DelegatedFrameProvider(resources_, frame_data.Pass()); | 48 provider_ = new DelegatedFrameProvider(resources_, std::move(frame_data)); |
| 49 LayerSettings layer_settings; | 49 LayerSettings layer_settings; |
| 50 root_layer_ = SolidColorLayer::Create(layer_settings); | 50 root_layer_ = SolidColorLayer::Create(layer_settings); |
| 51 layer_before_ = SolidColorLayer::Create(layer_settings); | 51 layer_before_ = SolidColorLayer::Create(layer_settings); |
| 52 delegated_renderer_layer_ = | 52 delegated_renderer_layer_ = |
| 53 FakeDelegatedRendererLayer::Create(layer_settings, provider_.get()); | 53 FakeDelegatedRendererLayer::Create(layer_settings, provider_.get()); |
| 54 } | 54 } |
| 55 | 55 |
| 56 protected: | 56 protected: |
| 57 scoped_refptr<Layer> root_layer_; | 57 scoped_refptr<Layer> root_layer_; |
| 58 scoped_refptr<Layer> layer_before_; | 58 scoped_refptr<Layer> layer_before_; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 73 EXPECT_EQ(0, delegated_renderer_layer_->NumDescendantsThatDrawContent()); | 73 EXPECT_EQ(0, delegated_renderer_layer_->NumDescendantsThatDrawContent()); |
| 74 EXPECT_EQ(1, root_layer_->NumDescendantsThatDrawContent()); | 74 EXPECT_EQ(1, root_layer_->NumDescendantsThatDrawContent()); |
| 75 delegated_renderer_layer_->SetIsDrawable(true); | 75 delegated_renderer_layer_->SetIsDrawable(true); |
| 76 EXPECT_EQ(1000, delegated_renderer_layer_->NumDescendantsThatDrawContent()); | 76 EXPECT_EQ(1000, delegated_renderer_layer_->NumDescendantsThatDrawContent()); |
| 77 EXPECT_EQ(1001, layer_before_->NumDescendantsThatDrawContent()); | 77 EXPECT_EQ(1001, layer_before_->NumDescendantsThatDrawContent()); |
| 78 EXPECT_EQ(1002, root_layer_->NumDescendantsThatDrawContent()); | 78 EXPECT_EQ(1002, root_layer_->NumDescendantsThatDrawContent()); |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace | 81 } // namespace |
| 82 } // namespace cc | 82 } // namespace cc |
| OLD | NEW |