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

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

Issue 606113003: Revert of Make cc output surface creation async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_host_common_test.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 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 EXPECT_EQ(quad->rect.ToString(), quad->visible_rect.ToString()); 94 EXPECT_EQ(quad->rect.ToString(), quad->visible_rect.ToString());
95 } else { 95 } else {
96 EXPECT_NE(quad->rect.ToString(), quad->visible_rect.ToString()); 96 EXPECT_NE(quad->rect.ToString(), quad->visible_rect.ToString());
97 EXPECT_TRUE(quad->rect.Contains(quad->visible_rect)); 97 EXPECT_TRUE(quad->rect.Contains(quad->visible_rect));
98 ++(*partially_occluded_count); 98 ++(*partially_occluded_count);
99 } 99 }
100 } 100 }
101 } 101 }
102 102
103 LayerTestCommon::LayerImplTest::LayerImplTest() 103 LayerTestCommon::LayerImplTest::LayerImplTest()
104 : client_(FakeLayerTreeHostClient::DIRECT_3D), 104 : host_(FakeLayerTreeHost::Create()),
105 host_(FakeLayerTreeHost::Create(&client_)),
106 root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)), 105 root_layer_impl_(LayerImpl::Create(host_->host_impl()->active_tree(), 1)),
107 render_pass_(RenderPass::Create()) { 106 render_pass_(RenderPass::Create()) {
108 scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d(); 107 scoped_ptr<FakeOutputSurface> output_surface = FakeOutputSurface::Create3d();
109 host_->host_impl()->InitializeRenderer( 108 host_->host_impl()->InitializeRenderer(
110 output_surface.PassAs<OutputSurface>()); 109 output_surface.PassAs<OutputSurface>());
111 } 110 }
112 111
113 LayerTestCommon::LayerImplTest::~LayerImplTest() {} 112 LayerTestCommon::LayerImplTest::~LayerImplTest() {}
114 113
115 void LayerTestCommon::LayerImplTest::CalcDrawProps( 114 void LayerTestCommon::LayerImplTest::CalcDrawProps(
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 render_pass_->shared_quad_state_list.clear(); 155 render_pass_->shared_quad_state_list.clear();
157 occlusion_tracker_.set_occluded_target_rect_for_contributing_surface( 156 occlusion_tracker_.set_occluded_target_rect_for_contributing_surface(
158 occluded); 157 occluded);
159 bool for_replica = false; 158 bool for_replica = false;
160 RenderPassId id(1, 1); 159 RenderPassId id(1, 1);
161 surface_impl->AppendQuads( 160 surface_impl->AppendQuads(
162 render_pass_.get(), occlusion_tracker_, &data, for_replica, id); 161 render_pass_.get(), occlusion_tracker_, &data, for_replica, id);
163 } 162 }
164 163
165 } // namespace cc 164 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_host_common_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698