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

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

Issue 609663003: cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc-passas: PassAs-presubmit-warning 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/bsp_tree.cc ('k') | cc/output/gl_renderer.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 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 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback)
21 OVERRIDE { 21 OVERRIDE {
22 scoped_ptr<FakeOutputSurface> output_surface = 22 scoped_ptr<FakeOutputSurface> output_surface =
23 FakeOutputSurface::CreateDelegating3d(); 23 FakeOutputSurface::CreateDelegating3d();
24 output_surface_ = output_surface.get(); 24 output_surface_ = output_surface.get();
25 return output_surface.PassAs<OutputSurface>(); 25 return output_surface.Pass();
26 } 26 }
27 27
28 protected: 28 protected:
29 TestWebGraphicsContext3D* context3d_; 29 TestWebGraphicsContext3D* context3d_;
30 FakeOutputSurface* output_surface_; 30 FakeOutputSurface* output_surface_;
31 }; 31 };
32 32
33 class DelegatingRendererTestDraw : public DelegatingRendererTest { 33 class DelegatingRendererTestDraw : public DelegatingRendererTest {
34 public: 34 public:
35 virtual void BeginTest() OVERRIDE { 35 virtual void BeginTest() OVERRIDE {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 EXPECT_EQ(24u, last_frame.delegated_frame_data->resource_list.size()); 132 EXPECT_EQ(24u, last_frame.delegated_frame_data->resource_list.size());
133 133
134 EndTest(); 134 EndTest();
135 } 135 }
136 }; 136 };
137 137
138 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F( 138 SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(
139 DelegatingRendererTestResources); 139 DelegatingRendererTestResources);
140 140
141 } // namespace cc 141 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/bsp_tree.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698