From c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc Mon Sep 17 00:00:00 2001 From: "weiliangc@chromium.org" Date: Mon, 23 Jun 2014 05:50:36 +0000 Subject: Removed QuadSink and MockQuadCuller Since QuadSink does not provide more functionatility than passing through to RenderPass and OcclusionTracker, it can be torn down and removed. Same is for MockQuadCuller. This CL follows 302603006, 306683002, 309493002. BUG=344962 TEST=cc_unittests Review URL: https://codereview.chromium.org/308193003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279050 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/layer_test_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cc/test/layer_test_common.h') diff --git a/cc/test/layer_test_common.h b/cc/test/layer_test_common.h index d3f2ab3..3b967ec 100644 --- a/cc/test/layer_test_common.h +++ b/cc/test/layer_test_common.h @@ -7,8 +7,9 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" +#include "cc/quads/render_pass.h" #include "cc/test/fake_layer_tree_host.h" -#include "cc/test/mock_quad_culler.h" +#include "cc/test/mock_occlusion_tracker.h" #include "cc/trees/layer_tree_host_impl.h" #define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test) \ @@ -113,14 +114,13 @@ class LayerTestCommon { LayerImpl* root_layer() const { return root_layer_impl_.get(); } FakeLayerTreeHostImpl* host_impl() const { return host_->host_impl(); } Proxy* proxy() const { return host_->host_impl()->proxy(); } - const QuadList& quad_list() const { return quad_culler_->quad_list(); } + const QuadList& quad_list() const { return render_pass_->quad_list; } private: scoped_ptr host_; scoped_ptr root_layer_impl_; scoped_ptr render_pass_; MockOcclusionTracker occlusion_tracker_; - scoped_ptr quad_culler_; }; }; -- cgit v1.1