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

Side by Side Diff: cc/test/layer_test_common.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (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
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_pixel_test.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/test/layer_test_common.h" 5 #include "cc/test/layer_test_common.h"
6 6
7 #include "cc/base/math_util.h" 7 #include "cc/base/math_util.h"
8 #include "cc/base/region.h" 8 #include "cc/base/region.h"
9 #include "cc/layers/append_quads_data.h" 9 #include "cc/layers/append_quads_data.h"
10 #include "cc/quads/draw_quad.h" 10 #include "cc/quads/draw_quad.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 105 }
106 } 106 }
107 } 107 }
108 108
109 LayerTestCommon::LayerImplTest::LayerImplTest() 109 LayerTestCommon::LayerImplTest::LayerImplTest()
110 : client_(FakeLayerTreeHostClient::DIRECT_3D), 110 : client_(FakeLayerTreeHostClient::DIRECT_3D),
111 host_(FakeLayerTreeHost::Create(&client_)), 111 host_(FakeLayerTreeHost::Create(&client_)),
112 root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)), 112 root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)),
113 render_pass_(RenderPass::Create()) { 113 render_pass_(RenderPass::Create()) {
114 scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d(); 114 scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d();
115 host_->host_impl()->InitializeRenderer(FakeOutputSurface::Create3d()); 115 host_->host_impl()->InitializeRenderer(
116 output_surface.PassAs<OutputSurface>());
116 } 117 }
117 118
118 LayerTestCommon::LayerImplTest::~LayerImplTest() {} 119 LayerTestCommon::LayerImplTest::~LayerImplTest() {}
119 120
120 void LayerTestCommon::LayerImplTest::CalcDrawProps( 121 void LayerTestCommon::LayerImplTest::CalcDrawProps(
121 const gfx::Size& viewport_size) { 122 const gfx::Size& viewport_size) {
122 LayerImplList layer_list; 123 LayerImplList layer_list;
123 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( 124 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
124 root_layer_impl_.get(), viewport_size, &layer_list); 125 root_layer_impl_.get(), viewport_size, &layer_list);
125 LayerTreeHostCommon::CalculateDrawProperties(&inputs); 126 LayerTreeHostCommon::CalculateDrawProperties(&inputs);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 render_pass_->shared_quad_state_list.clear(); 162 render_pass_->shared_quad_state_list.clear();
162 occlusion_tracker_.set_occluded_target_rect_for_contributing_surface( 163 occlusion_tracker_.set_occluded_target_rect_for_contributing_surface(
163 occluded); 164 occluded);
164 bool for_replica = false; 165 bool for_replica = false;
165 RenderPassId id(1, 1); 166 RenderPassId id(1, 1);
166 surface_impl->AppendQuads( 167 surface_impl->AppendQuads(
167 render_pass_.get(), occlusion_tracker_, &data, for_replica, id); 168 render_pass_.get(), occlusion_tracker_, &data, for_replica, id);
168 } 169 }
169 170
170 } // namespace cc 171 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698