Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1824)

Side by Side Diff: cc/trees/layer_tree_host_unittest_no_message_loop.cc

Issue 619843002: cc: Make separate interface for BeginFrame ipc from OutputSurface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
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/test/fake_delegated_renderer_layer.h" 17 #include "cc/test/fake_delegated_renderer_layer.h"
17 #include "cc/test/test_context_provider.h" 18 #include "cc/test/test_context_provider.h"
18 #include "cc/trees/layer_tree_host.h" 19 #include "cc/trees/layer_tree_host.h"
19 #include "cc/trees/layer_tree_host_client.h" 20 #include "cc/trees/layer_tree_host_client.h"
20 #include "cc/trees/layer_tree_host_single_thread_client.h" 21 #include "cc/trees/layer_tree_host_single_thread_client.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 #include "third_party/skia/include/core/SkColor.h" 23 #include "third_party/skia/include/core/SkColor.h"
23 #include "ui/gfx/frame_time.h" 24 #include "ui/gfx/frame_time.h"
24 25
25 namespace cc { 26 namespace cc {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 EXPECT_FALSE(base::MessageLoopProxy::current().get()); 95 EXPECT_FALSE(base::MessageLoopProxy::current().get());
95 } 96 }
96 97
97 protected: 98 protected:
98 virtual void RunTestWithoutMessageLoop() = 0; 99 virtual void RunTestWithoutMessageLoop() = 0;
99 100
100 void SetupLayerTreeHost() { 101 void SetupLayerTreeHost() {
101 LayerTreeSettings settings; 102 LayerTreeSettings settings;
102 settings.single_thread_proxy_scheduler = false; 103 settings.single_thread_proxy_scheduler = false;
103 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded( 104 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(
104 this, this, NULL, NULL, settings, NULL); 105 this, this, NULL, NULL, settings, NULL, nullptr);
105 layer_tree_host_->SetViewportSize(size_); 106 layer_tree_host_->SetViewportSize(size_);
106 layer_tree_host_->SetRootLayer(root_layer_); 107 layer_tree_host_->SetRootLayer(root_layer_);
107 } 108 }
108 109
109 void Composite() { 110 void Composite() {
110 did_commit_ = false; 111 did_commit_ = false;
111 did_commit_and_draw_frame_ = false; 112 did_commit_and_draw_frame_ = false;
112 layer_tree_host_->Composite(gfx::FrameTime::Now()); 113 layer_tree_host_->Composite(gfx::FrameTime::Now());
113 EXPECT_TRUE(did_initialize_output_surface_); 114 EXPECT_TRUE(did_initialize_output_surface_);
114 EXPECT_TRUE(did_commit_); 115 EXPECT_TRUE(did_commit_);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 scoped_refptr<DelegatedFrameProvider> frame_provider_; 232 scoped_refptr<DelegatedFrameProvider> frame_provider_;
232 scoped_refptr<DelegatedRendererLayer> delegated_layer_; 233 scoped_refptr<DelegatedRendererLayer> delegated_layer_;
233 }; 234 };
234 235
235 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { 236 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) {
236 RunTest(); 237 RunTest();
237 } 238 }
238 239
239 } // namespace 240 } // namespace
240 } // namespace cc 241 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698