diff options
| author | weiliangc@chromium.org <weiliangc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 05:50:36 +0000 |
|---|---|---|
| committer | weiliangc@chromium.org <weiliangc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 05:50:36 +0000 |
| commit | c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc (patch) | |
| tree | f48af1cf16e746234a67d19ab3e26772d7fb3ea7 /cc/test/layer_test_common.h | |
| parent | 8ef1b247b6685d8c87e936c4b0427aa464fad464 (diff) | |
| download | chromium_src-c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc.zip chromium_src-c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc.tar.gz chromium_src-c6707fdbb7ab92a3ded2f6f18542bc77770e9cfc.tar.bz2 | |
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
Diffstat (limited to 'cc/test/layer_test_common.h')
| -rw-r--r-- | cc/test/layer_test_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<FakeLayerTreeHost> host_; scoped_ptr<LayerImpl> root_layer_impl_; scoped_ptr<RenderPass> render_pass_; MockOcclusionTracker<LayerImpl> occlusion_tracker_; - scoped_ptr<MockQuadCuller> quad_culler_; }; }; |