Chromium Code Reviews| 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/message_loop/message_loop_proxy.h" | 5 #include "base/message_loop/message_loop_proxy.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" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 EXPECT_FALSE(base::MessageLoopProxy::current().get()); | 94 EXPECT_FALSE(base::MessageLoopProxy::current().get()); |
| 95 } | 95 } |
| 96 | 96 |
| 97 protected: | 97 protected: |
| 98 virtual void RunTestWithoutMessageLoop() = 0; | 98 virtual void RunTestWithoutMessageLoop() = 0; |
| 99 | 99 |
| 100 void SetupLayerTreeHost() { | 100 void SetupLayerTreeHost() { |
| 101 LayerTreeSettings settings; | 101 LayerTreeSettings settings; |
| 102 settings.single_thread_proxy_scheduler = false; | 102 settings.single_thread_proxy_scheduler = false; |
| 103 layer_tree_host_ = | 103 layer_tree_host_ = |
| 104 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); | 104 LayerTreeHost::CreateSingleThreaded(this, this, nullptr, settings, nullp tr); |
|
danakj
2014/10/09 16:00:53
please don't ignore our presubmit warnings. fix up
| |
| 105 layer_tree_host_->SetViewportSize(size_); | 105 layer_tree_host_->SetViewportSize(size_); |
| 106 layer_tree_host_->SetRootLayer(root_layer_); | 106 layer_tree_host_->SetRootLayer(root_layer_); |
| 107 } | 107 } |
| 108 | 108 |
| 109 void Composite() { | 109 void Composite() { |
| 110 did_commit_ = false; | 110 did_commit_ = false; |
| 111 did_commit_and_draw_frame_ = false; | 111 did_commit_and_draw_frame_ = false; |
| 112 layer_tree_host_->Composite(gfx::FrameTime::Now()); | 112 layer_tree_host_->Composite(gfx::FrameTime::Now()); |
| 113 EXPECT_TRUE(did_initialize_output_surface_); | 113 EXPECT_TRUE(did_initialize_output_surface_); |
| 114 EXPECT_TRUE(did_commit_); | 114 EXPECT_TRUE(did_commit_); |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 182 Composite(); | 182 Composite(); |
| 183 | 183 |
| 184 // Prepare and draw second frame. | 184 // Prepare and draw second frame. |
| 185 frame_provider_->SetFrameData(CreateFrameDataWithResource(999)); | 185 frame_provider_->SetFrameData(CreateFrameDataWithResource(999)); |
| 186 Composite(); | 186 Composite(); |
| 187 | 187 |
| 188 // Resource from first frame should be returned. | 188 // Resource from first frame should be returned. |
| 189 CheckReturnedResource(1u); | 189 CheckReturnedResource(1u); |
| 190 | 190 |
| 191 TearDownLayerTreeHost(); | 191 TearDownLayerTreeHost(); |
| 192 delegated_layer_ = NULL; | 192 delegated_layer_ = nullptr; |
| 193 frame_provider_ = NULL; | 193 frame_provider_ = nullptr; |
| 194 | 194 |
| 195 // Resource from second frame should be returned. | 195 // Resource from second frame should be returned. |
| 196 CheckReturnedResource(1u); | 196 CheckReturnedResource(1u); |
| 197 resource_collection_ = NULL; | 197 resource_collection_ = nullptr; |
| 198 } | 198 } |
| 199 | 199 |
| 200 // DelegatedFrameResourceCollectionClient overrides. | 200 // DelegatedFrameResourceCollectionClient overrides. |
| 201 virtual void UnusedResourcesAreAvailable() override {} | 201 virtual void UnusedResourcesAreAvailable() override {} |
| 202 | 202 |
| 203 private: | 203 private: |
| 204 scoped_ptr<DelegatedFrameData> CreateFrameDataWithResource( | 204 scoped_ptr<DelegatedFrameData> CreateFrameDataWithResource( |
| 205 ResourceProvider::ResourceId resource_id) { | 205 ResourceProvider::ResourceId resource_id) { |
| 206 scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData); | 206 scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData); |
| 207 gfx::Rect frame_rect(size_); | 207 gfx::Rect frame_rect(size_); |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 231 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 231 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
| 232 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 232 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
| 233 }; | 233 }; |
| 234 | 234 |
| 235 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 235 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
| 236 RunTest(); | 236 RunTest(); |
| 237 } | 237 } |
| 238 | 238 |
| 239 } // namespace | 239 } // namespace |
| 240 } // namespace cc | 240 } // namespace cc |
| OLD | NEW |