From 00f7925e51f92cdead5b154998046298720d7711 Mon Sep 17 00:00:00 2001 From: danakj Date: Mon, 15 Jun 2015 14:19:22 -0700 Subject: cc: De-templatize the OcclusionTracker class. The OcclusionTracker only needs to work on LayerImpls now, so drop the templates from it, and remove the Layer version of the unit tests. R=enne, vmpstr BUG=413479 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1182733003 Cr-Commit-Position: refs/heads/master@{#334460} --- cc/test/mock_occlusion_tracker.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'cc/test/mock_occlusion_tracker.h') diff --git a/cc/test/mock_occlusion_tracker.h b/cc/test/mock_occlusion_tracker.h index 649eb76..b291bf5 100644 --- a/cc/test/mock_occlusion_tracker.h +++ b/cc/test/mock_occlusion_tracker.h @@ -9,36 +9,32 @@ namespace cc { -template -class MockOcclusionTracker : public OcclusionTracker { +class MockOcclusionTracker : public OcclusionTracker { // This class is used for testing only. It fakes just enough information to // calculate unoccluded content rect and unoccluded contributing surface // content rect. It calls the helper function of occlusion tracker to avoid // DCHECKs since testing environment won't be set up properly to pass those. public: - MockOcclusionTracker() - : OcclusionTracker(gfx::Rect(0, 0, 1000, 1000)) { - typename OcclusionTracker::StackObject stack_obj; - OcclusionTracker::stack_.push_back(stack_obj); - OcclusionTracker::stack_.push_back(stack_obj); + MockOcclusionTracker() : OcclusionTracker(gfx::Rect(0, 0, 1000, 1000)) { + OcclusionTracker::StackObject stack_obj; + OcclusionTracker::stack_.push_back(stack_obj); + OcclusionTracker::stack_.push_back(stack_obj); } explicit MockOcclusionTracker(const gfx::Rect& screen_scissor_rect) - : OcclusionTracker(screen_scissor_rect) { - typename OcclusionTracker::StackObject stack_obj; - OcclusionTracker::stack_.push_back(stack_obj); - OcclusionTracker::stack_.push_back(stack_obj); + : OcclusionTracker(screen_scissor_rect) { + OcclusionTracker::StackObject stack_obj; + OcclusionTracker::stack_.push_back(stack_obj); + OcclusionTracker::stack_.push_back(stack_obj); } void set_occluded_target_rect(const gfx::Rect& occluded) { - OcclusionTracker::stack_.back().occlusion_from_inside_target = - occluded; + OcclusionTracker::stack_.back().occlusion_from_inside_target = occluded; } void set_occluded_target_rect_for_contributing_surface( const gfx::Rect& occluded) { - OcclusionTracker< - LayerType>::stack_[OcclusionTracker::stack_.size() - 2] + OcclusionTracker::stack_[OcclusionTracker::stack_.size() - 2] .occlusion_from_inside_target = occluded; } -- cgit v1.1