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

Side by Side Diff: cc/output/delegating_renderer_unittest.cc

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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
« no previous file with comments | « cc/output/delegating_renderer.h ('k') | cc/output/direct_renderer.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/output/delegating_renderer.h" 5 #include "cc/output/delegating_renderer.h"
6 6
7 #include "cc/test/fake_output_surface.h" 7 #include "cc/test/fake_output_surface.h"
8 #include "cc/test/layer_tree_test.h" 8 #include "cc/test/layer_tree_test.h"
9 #include "cc/test/render_pass_test_common.h" 9 #include "cc/test/render_pass_test_common.h"
10 #include "cc/test/render_pass_test_utils.h" 10 #include "cc/test/render_pass_test_utils.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 class DelegatingRendererTest : public LayerTreeTest { 15 class DelegatingRendererTest : public LayerTreeTest {
16 public: 16 public:
17 DelegatingRendererTest() : LayerTreeTest(), output_surface_(NULL) {} 17 DelegatingRendererTest() : LayerTreeTest(), output_surface_(NULL) {}
18 virtual ~DelegatingRendererTest() {} 18 virtual ~DelegatingRendererTest() {}
19 19
20 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) 20 scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) override {
21 override {
22 scoped_ptr<FakeOutputSurface> output_surface = 21 scoped_ptr<FakeOutputSurface> output_surface =
23 FakeOutputSurface::CreateDelegating3d(); 22 FakeOutputSurface::CreateDelegating3d();
24 output_surface_ = output_surface.get(); 23 output_surface_ = output_surface.get();
25 return output_surface.Pass(); 24 return output_surface.Pass();
26 } 25 }
27 26
28 protected: 27 protected:
29 TestWebGraphicsContext3D* context3d_; 28 TestWebGraphicsContext3D* context3d_;
30 FakeOutputSurface* output_surface_; 29 FakeOutputSurface* output_surface_;
31 }; 30 };
32 31
33 class DelegatingRendererTestDraw : public DelegatingRendererTest { 32 class DelegatingRendererTestDraw : public DelegatingRendererTest {
34 public: 33 public:
35 virtual void BeginTest() override { 34 void BeginTest() override {
36 layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.5f, 4.f); 35 layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.5f, 4.f);
37 PostSetNeedsCommitToMainThread(); 36 PostSetNeedsCommitToMainThread();
38 } 37 }
39 38
40 virtual void AfterTest() override {} 39 void AfterTest() override {}
41 40
42 virtual DrawResult PrepareToDrawOnThread( 41 DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
43 LayerTreeHostImpl* host_impl, 42 LayerTreeHostImpl::FrameData* frame,
44 LayerTreeHostImpl::FrameData* frame, 43 DrawResult draw_result) override {
45 DrawResult draw_result) override {
46 EXPECT_EQ(0u, output_surface_->num_sent_frames()); 44 EXPECT_EQ(0u, output_surface_->num_sent_frames());
47 45
48 const CompositorFrame& last_frame = output_surface_->last_sent_frame(); 46 const CompositorFrame& last_frame = output_surface_->last_sent_frame();
49 EXPECT_FALSE(last_frame.delegated_frame_data); 47 EXPECT_FALSE(last_frame.delegated_frame_data);
50 EXPECT_FALSE(last_frame.gl_frame_data); 48 EXPECT_FALSE(last_frame.gl_frame_data);
51 EXPECT_EQ(0.f, last_frame.metadata.min_page_scale_factor); 49 EXPECT_EQ(0.f, last_frame.metadata.min_page_scale_factor);
52 EXPECT_EQ(0.f, last_frame.metadata.max_page_scale_factor); 50 EXPECT_EQ(0.f, last_frame.metadata.max_page_scale_factor);
53 return DRAW_SUCCESS; 51 return DRAW_SUCCESS;
54 } 52 }
55 53
56 virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override { 54 void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
57 EXPECT_EQ(0u, output_surface_->num_sent_frames()); 55 EXPECT_EQ(0u, output_surface_->num_sent_frames());
58 } 56 }
59 57
60 virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, 58 void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
61 bool result) override {
62 EXPECT_TRUE(result); 59 EXPECT_TRUE(result);
63 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 60 EXPECT_EQ(1u, output_surface_->num_sent_frames());
64 61
65 const CompositorFrame& last_frame = output_surface_->last_sent_frame(); 62 const CompositorFrame& last_frame = output_surface_->last_sent_frame();
66 DelegatedFrameData* last_frame_data = last_frame.delegated_frame_data.get(); 63 DelegatedFrameData* last_frame_data = last_frame.delegated_frame_data.get();
67 ASSERT_TRUE(last_frame.delegated_frame_data); 64 ASSERT_TRUE(last_frame.delegated_frame_data);
68 EXPECT_FALSE(last_frame.gl_frame_data); 65 EXPECT_FALSE(last_frame.gl_frame_data);
69 EXPECT_EQ(host_impl->DeviceViewport().ToString(), 66 EXPECT_EQ(host_impl->DeviceViewport().ToString(),
70 last_frame_data->render_pass_list.back()->output_rect.ToString()); 67 last_frame_data->render_pass_list.back()->output_rect.ToString());
71 EXPECT_EQ(0.5f, last_frame.metadata.min_page_scale_factor); 68 EXPECT_EQ(0.5f, last_frame.metadata.min_page_scale_factor);
72 EXPECT_EQ(4.f, last_frame.metadata.max_page_scale_factor); 69 EXPECT_EQ(4.f, last_frame.metadata.max_page_scale_factor);
73 70
74 EXPECT_EQ( 71 EXPECT_EQ(
75 0u, last_frame.delegated_frame_data->resource_list.size()); 72 0u, last_frame.delegated_frame_data->resource_list.size());
76 EXPECT_EQ(1u, last_frame.delegated_frame_data->render_pass_list.size()); 73 EXPECT_EQ(1u, last_frame.delegated_frame_data->render_pass_list.size());
77 74
78 EndTest(); 75 EndTest();
79 } 76 }
80 }; 77 };
81 78
82 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(DelegatingRendererTestDraw); 79 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(DelegatingRendererTestDraw);
83 80
84 class DelegatingRendererTestResources : public DelegatingRendererTest { 81 class DelegatingRendererTestResources : public DelegatingRendererTest {
85 public: 82 public:
86 virtual void BeginTest() override { 83 void BeginTest() override { PostSetNeedsCommitToMainThread(); }
87 PostSetNeedsCommitToMainThread();
88 }
89 84
90 virtual void AfterTest() override {} 85 void AfterTest() override {}
91 86
92 virtual DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl, 87 DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
93 LayerTreeHostImpl::FrameData* frame, 88 LayerTreeHostImpl::FrameData* frame,
94 DrawResult draw_result) override { 89 DrawResult draw_result) override {
95 frame->render_passes.clear(); 90 frame->render_passes.clear();
96 frame->render_passes_by_id.clear(); 91 frame->render_passes_by_id.clear();
97 92
98 TestRenderPass* child_pass = AddRenderPass(&frame->render_passes, 93 TestRenderPass* child_pass = AddRenderPass(&frame->render_passes,
99 RenderPassId(2, 1), 94 RenderPassId(2, 1),
100 gfx::Rect(3, 3, 10, 10), 95 gfx::Rect(3, 3, 10, 10),
101 gfx::Transform()); 96 gfx::Transform());
102 child_pass->AppendOneOfEveryQuadType(host_impl->resource_provider(), 97 child_pass->AppendOneOfEveryQuadType(host_impl->resource_provider(),
103 RenderPassId(0, 0)); 98 RenderPassId(0, 0));
104 99
105 TestRenderPass* pass = AddRenderPass(&frame->render_passes, 100 TestRenderPass* pass = AddRenderPass(&frame->render_passes,
106 RenderPassId(1, 1), 101 RenderPassId(1, 1),
107 gfx::Rect(3, 3, 10, 10), 102 gfx::Rect(3, 3, 10, 10),
108 gfx::Transform()); 103 gfx::Transform());
109 pass->AppendOneOfEveryQuadType( 104 pass->AppendOneOfEveryQuadType(
110 host_impl->resource_provider(), child_pass->id); 105 host_impl->resource_provider(), child_pass->id);
111 return draw_result; 106 return draw_result;
112 } 107 }
113 108
114 virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override { 109 void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
115 EXPECT_EQ(0u, output_surface_->num_sent_frames()); 110 EXPECT_EQ(0u, output_surface_->num_sent_frames());
116 } 111 }
117 112
118 virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, 113 void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, bool result) override {
119 bool result) override {
120 EXPECT_TRUE(result); 114 EXPECT_TRUE(result);
121 EXPECT_EQ(1u, output_surface_->num_sent_frames()); 115 EXPECT_EQ(1u, output_surface_->num_sent_frames());
122 116
123 const CompositorFrame& last_frame = output_surface_->last_sent_frame(); 117 const CompositorFrame& last_frame = output_surface_->last_sent_frame();
124 ASSERT_TRUE(last_frame.delegated_frame_data); 118 ASSERT_TRUE(last_frame.delegated_frame_data);
125 119
126 EXPECT_EQ(2u, last_frame.delegated_frame_data->render_pass_list.size()); 120 EXPECT_EQ(2u, last_frame.delegated_frame_data->render_pass_list.size());
127 // Each render pass has 11 resources in it. And the root render pass has a 121 // Each render pass has 11 resources in it. And the root render pass has a
128 // mask resource used when drawing the child render pass, as well as its 122 // mask resource used when drawing the child render pass, as well as its
129 // replica (it's added twice). The number 11 may change if 123 // replica (it's added twice). The number 11 may change if
130 // AppendOneOfEveryQuadType() is updated, and the value here should be 124 // AppendOneOfEveryQuadType() is updated, and the value here should be
131 // updated accordingly. 125 // updated accordingly.
132 EXPECT_EQ(24u, last_frame.delegated_frame_data->resource_list.size()); 126 EXPECT_EQ(24u, last_frame.delegated_frame_data->resource_list.size());
133 127
134 EndTest(); 128 EndTest();
135 } 129 }
136 }; 130 };
137 131
138 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F( 132 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(
139 DelegatingRendererTestResources); 133 DelegatingRendererTestResources);
140 134
141 } // namespace cc 135 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/delegating_renderer.h ('k') | cc/output/direct_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698