Index: cc/test/mock_quad_culler.h |
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h |
index 9ad07406f277de0fb50758b4345455e779446cd6..ca2f0aa3e52ccec88850f12697d2d92f6e56f8a9 100644 |
--- a/cc/test/mock_quad_culler.h |
+++ b/cc/test/mock_quad_culler.h |
@@ -18,21 +18,20 @@ class MockQuadCuller : public QuadSink { |
public: |
virtual ~MockQuadCuller(); |
- MockQuadCuller(RenderPass* external_render_pass, |
+ MockQuadCuller(RenderPass* render_pass, |
MockOcclusionTracker<LayerImpl>* occlusion_tracker); |
- // QuadSink interface. |
- virtual SharedQuadState* CreateSharedQuadState() OVERRIDE; |
- virtual gfx::Rect UnoccludedContentRect(const gfx::Rect& content_rect, |
- const gfx::Transform& draw_transform) |
- OVERRIDE; |
+ |
+ virtual gfx::Rect UnoccludedContentRect( |
+ const gfx::Rect& content_rect, |
+ const gfx::Transform& draw_transform) OVERRIDE; |
+ |
virtual gfx::Rect UnoccludedContributingSurfaceContentRect( |
const gfx::Rect& content_rect, |
const gfx::Transform& draw_transform) OVERRIDE; |
- virtual void Append(scoped_ptr<DrawQuad> draw_quad) OVERRIDE; |
- const QuadList& quad_list() const { return active_render_pass_->quad_list; } |
+ const QuadList& quad_list() const { return render_pass_->quad_list; } |
const SharedQuadStateList& shared_quad_state_list() const { |
- return active_render_pass_->shared_quad_state_list; |
+ return render_pass_->shared_quad_state_list; |
} |
void set_occluded_target_rect(const gfx::Rect& occluded) { |
@@ -46,18 +45,12 @@ class MockQuadCuller : public QuadSink { |
} |
void clear_lists() { |
- active_render_pass_->quad_list.clear(); |
- active_render_pass_->shared_quad_state_list.clear(); |
+ render_pass_->quad_list.clear(); |
+ render_pass_->shared_quad_state_list.clear(); |
} |
private: |
- scoped_ptr<RenderPass> render_pass_storage_; |
- RenderPass* active_render_pass_; |
- scoped_ptr<MockOcclusionTracker<LayerImpl> > occlusion_tracker_storage_; |
MockOcclusionTracker<LayerImpl>* occlusion_tracker_; |
- |
- gfx::Rect occluded_target_rect_; |
- gfx::Rect occluded_target_rect_for_contributing_surface_; |
}; |
} // namespace cc |