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 "base/thread_task_runner_handle.h" | 5 #include "base/thread_task_runner_handle.h" |
6 #include "base/threading/simple_thread.h" | 6 #include "base/threading/simple_thread.h" |
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/delegated_renderer_layer.h" | 9 #include "cc/layers/delegated_renderer_layer.h" |
10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
11 #include "cc/layers/solid_color_layer.h" | 11 #include "cc/layers/solid_color_layer.h" |
12 #include "cc/output/delegated_frame_data.h" | 12 #include "cc/output/delegated_frame_data.h" |
13 #include "cc/output/output_surface.h" | 13 #include "cc/output/output_surface.h" |
14 #include "cc/output/output_surface_client.h" | 14 #include "cc/output/output_surface_client.h" |
15 #include "cc/resources/resource_provider.h" | 15 #include "cc/resources/resource_provider.h" |
16 #include "cc/scheduler/begin_frame_source.h" | 16 #include "cc/scheduler/begin_frame_source.h" |
17 #include "cc/test/fake_delegated_renderer_layer.h" | 17 #include "cc/test/fake_delegated_renderer_layer.h" |
18 #include "cc/test/test_context_provider.h" | 18 #include "cc/test/test_context_provider.h" |
19 #include "cc/trees/layer_tree_host.h" | 19 #include "cc/trees/layer_tree_host.h" |
20 #include "cc/trees/layer_tree_host_client.h" | 20 #include "cc/trees/layer_tree_host_client.h" |
21 #include "cc/trees/layer_tree_host_single_thread_client.h" | 21 #include "cc/trees/layer_tree_host_single_thread_client.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
23 #include "third_party/skia/include/core/SkColor.h" | 23 #include "third_party/skia/include/core/SkColor.h" |
24 #include "ui/gfx/frame_time.h" | |
25 | 24 |
26 namespace cc { | 25 namespace cc { |
27 namespace { | 26 namespace { |
28 | 27 |
29 class NoMessageLoopOutputSurface : public OutputSurface { | 28 class NoMessageLoopOutputSurface : public OutputSurface { |
30 public: | 29 public: |
31 NoMessageLoopOutputSurface() : OutputSurface(TestContextProvider::Create()) {} | 30 NoMessageLoopOutputSurface() : OutputSurface(TestContextProvider::Create()) {} |
32 ~NoMessageLoopOutputSurface() override {} | 31 ~NoMessageLoopOutputSurface() override {} |
33 | 32 |
34 // OutputSurface overrides. | 33 // OutputSurface overrides. |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 params.client = this; | 109 params.client = this; |
111 params.settings = &settings; | 110 params.settings = &settings; |
112 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(this, ¶ms); | 111 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(this, ¶ms); |
113 layer_tree_host_->SetViewportSize(size_); | 112 layer_tree_host_->SetViewportSize(size_); |
114 layer_tree_host_->SetRootLayer(root_layer_); | 113 layer_tree_host_->SetRootLayer(root_layer_); |
115 } | 114 } |
116 | 115 |
117 void Composite() { | 116 void Composite() { |
118 did_commit_ = false; | 117 did_commit_ = false; |
119 did_commit_and_draw_frame_ = false; | 118 did_commit_and_draw_frame_ = false; |
120 layer_tree_host_->Composite(gfx::FrameTime::Now()); | 119 layer_tree_host_->Composite(base::TimeTicks::Now()); |
121 EXPECT_TRUE(did_initialize_output_surface_); | 120 EXPECT_TRUE(did_initialize_output_surface_); |
122 EXPECT_TRUE(did_commit_); | 121 EXPECT_TRUE(did_commit_); |
123 EXPECT_TRUE(did_commit_and_draw_frame_); | 122 EXPECT_TRUE(did_commit_and_draw_frame_); |
124 } | 123 } |
125 | 124 |
126 void TearDownLayerTreeHost() { | 125 void TearDownLayerTreeHost() { |
127 // Explicit teardown to make failures easier to debug. | 126 // Explicit teardown to make failures easier to debug. |
128 layer_tree_host_ = nullptr; | 127 layer_tree_host_ = nullptr; |
129 root_layer_ = nullptr; | 128 root_layer_ = nullptr; |
130 } | 129 } |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 238 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
240 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 239 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
241 }; | 240 }; |
242 | 241 |
243 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 242 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
244 RunTest(); | 243 RunTest(); |
245 } | 244 } |
246 | 245 |
247 } // namespace | 246 } // namespace |
248 } // namespace cc | 247 } // namespace cc |
OLD | NEW |