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

Side by Side Diff: cc/layers/surface_layer_unittest.cc

Issue 1177033008: cc: Turn impl_side_painting and use_one_copy on in LayerTreeSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: implon: fixwebkittests Created 5 years, 6 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
« no previous file with comments | « cc/layers/solid_color_layer_impl_unittest.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <set> 5 #include <set>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
11 #include "cc/layers/solid_color_layer.h" 11 #include "cc/layers/solid_color_layer.h"
12 #include "cc/layers/surface_layer.h" 12 #include "cc/layers/surface_layer.h"
13 #include "cc/test/fake_impl_proxy.h" 13 #include "cc/test/fake_impl_proxy.h"
14 #include "cc/test/fake_layer_tree_host.h" 14 #include "cc/test/fake_layer_tree_host.h"
15 #include "cc/test/fake_layer_tree_host_client.h" 15 #include "cc/test/fake_layer_tree_host_client.h"
16 #include "cc/test/fake_layer_tree_host_impl.h" 16 #include "cc/test/fake_layer_tree_host_impl.h"
17 #include "cc/test/fake_output_surface.h" 17 #include "cc/test/fake_output_surface.h"
18 #include "cc/test/layer_tree_test.h" 18 #include "cc/test/layer_tree_test.h"
19 #include "cc/test/test_shared_bitmap_manager.h" 19 #include "cc/test/test_task_graph_runner.h"
20 #include "cc/trees/layer_tree_host.h" 20 #include "cc/trees/layer_tree_host.h"
21 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace cc { 24 namespace cc {
25 namespace { 25 namespace {
26 26
27 class SurfaceLayerTest : public testing::Test { 27 class SurfaceLayerTest : public testing::Test {
28 public: 28 public:
29 SurfaceLayerTest() 29 SurfaceLayerTest()
30 : fake_client_( 30 : fake_client_(
31 FakeLayerTreeHostClient(FakeLayerTreeHostClient::DIRECT_3D)) {} 31 FakeLayerTreeHostClient(FakeLayerTreeHostClient::DIRECT_3D)) {}
32 32
33 protected: 33 protected:
34 void SetUp() override { 34 void SetUp() override {
35 layer_tree_host_ = FakeLayerTreeHost::Create(&fake_client_); 35 layer_tree_host_ =
36 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
36 layer_tree_host_->SetViewportSize(gfx::Size(10, 10)); 37 layer_tree_host_->SetViewportSize(gfx::Size(10, 10));
37 } 38 }
38 39
39 void TearDown() override { 40 void TearDown() override {
40 if (layer_tree_host_) { 41 if (layer_tree_host_) {
41 layer_tree_host_->SetRootLayer(nullptr); 42 layer_tree_host_->SetRootLayer(nullptr);
42 layer_tree_host_ = nullptr; 43 layer_tree_host_ = nullptr;
43 } 44 }
44 } 45 }
45 46
47 FakeLayerTreeHostClient fake_client_;
48 TestTaskGraphRunner task_graph_runner_;
46 scoped_ptr<FakeLayerTreeHost> layer_tree_host_; 49 scoped_ptr<FakeLayerTreeHost> layer_tree_host_;
47 FakeLayerTreeHostClient fake_client_;
48 TestSharedBitmapManager shared_bitmap_manager_;
49 LayerSettings layer_settings_; 50 LayerSettings layer_settings_;
50 }; 51 };
51 52
52 void SatisfyCallback(SurfaceSequence* out, SurfaceSequence in) { 53 void SatisfyCallback(SurfaceSequence* out, SurfaceSequence in) {
53 *out = in; 54 *out = in;
54 } 55 }
55 56
56 void RequireCallback(SurfaceId* out_id, 57 void RequireCallback(SurfaceId* out_id,
57 std::set<SurfaceSequence>* out, 58 std::set<SurfaceSequence>* out,
58 SurfaceId in_id, 59 SurfaceId in_id,
(...skipping 10 matching lines...) Expand all
69 SurfaceId required_id; 70 SurfaceId required_id;
70 std::set<SurfaceSequence> required_seq; 71 std::set<SurfaceSequence> required_seq;
71 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( 72 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
72 layer_settings_, base::Bind(&SatisfyCallback, &blank_change), 73 layer_settings_, base::Bind(&SatisfyCallback, &blank_change),
73 base::Bind(&RequireCallback, &required_id, &required_seq))); 74 base::Bind(&RequireCallback, &required_id, &required_seq)));
74 layer->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1)); 75 layer->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
75 layer_tree_host_->set_surface_id_namespace(1); 76 layer_tree_host_->set_surface_id_namespace(1);
76 layer_tree_host_->SetRootLayer(layer); 77 layer_tree_host_->SetRootLayer(layer);
77 78
78 scoped_ptr<FakeLayerTreeHost> layer_tree_host2 = 79 scoped_ptr<FakeLayerTreeHost> layer_tree_host2 =
79 FakeLayerTreeHost::Create(&fake_client_); 80 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
80 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( 81 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create(
81 layer_settings_, base::Bind(&SatisfyCallback, &blank_change), 82 layer_settings_, base::Bind(&SatisfyCallback, &blank_change),
82 base::Bind(&RequireCallback, &required_id, &required_seq))); 83 base::Bind(&RequireCallback, &required_id, &required_seq)));
83 layer2->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1)); 84 layer2->SetSurfaceId(SurfaceId(1), 1.f, gfx::Size(1, 1));
84 layer_tree_host2->set_surface_id_namespace(2); 85 layer_tree_host2->set_surface_id_namespace(2);
85 layer_tree_host2->SetRootLayer(layer2); 86 layer_tree_host2->SetRootLayer(layer2);
86 87
87 // Layers haven't been removed, so no sequence should be satisfied. 88 // Layers haven't been removed, so no sequence should be satisfied.
88 EXPECT_TRUE(blank_change.is_null()); 89 EXPECT_TRUE(blank_change.is_null());
89 90
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 SurfaceId required_id_; 204 SurfaceId required_id_;
204 std::set<SurfaceSequence> required_set_; 205 std::set<SurfaceSequence> required_set_;
205 }; 206 };
206 207
207 // TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is 208 // TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is
208 // fixed. 209 // fixed.
209 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromise); 210 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromise);
210 211
211 } // namespace 212 } // namespace
212 } // namespace cc 213 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/solid_color_layer_impl_unittest.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698