diff options
Diffstat (limited to 'chromium/cc/trees/layer_tree_host_unittest_occlusion.cc')
-rw-r--r-- | chromium/cc/trees/layer_tree_host_unittest_occlusion.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/chromium/cc/trees/layer_tree_host_unittest_occlusion.cc b/chromium/cc/trees/layer_tree_host_unittest_occlusion.cc index 621d23d360f..cb6a5d32819 100644 --- a/chromium/cc/trees/layer_tree_host_unittest_occlusion.cc +++ b/chromium/cc/trees/layer_tree_host_unittest_occlusion.cc @@ -8,7 +8,7 @@ #include "cc/output/copy_output_request.h" #include "cc/output/copy_output_result.h" #include "cc/test/layer_tree_test.h" -#include "cc/test/occlusion_tracker_test_common.h" +#include "cc/test/test_occlusion_tracker.h" namespace cc { namespace { @@ -19,15 +19,14 @@ class TestLayer : public Layer { return make_scoped_refptr(new TestLayer()); } - virtual bool Update( - ResourceUpdateQueue* update_queue, - const OcclusionTracker* occlusion) OVERRIDE { + virtual bool Update(ResourceUpdateQueue* update_queue, + const OcclusionTracker<Layer>* occlusion) OVERRIDE { if (!occlusion) return false; // Gain access to internals of the OcclusionTracker. - const TestOcclusionTracker* test_occlusion = - static_cast<const TestOcclusionTracker*>(occlusion); + const TestOcclusionTracker<Layer>* test_occlusion = + static_cast<const TestOcclusionTracker<Layer>*>(occlusion); occlusion_ = UnionRegions( test_occlusion->occlusion_from_inside_target(), test_occlusion->occlusion_from_outside_target()); @@ -86,8 +85,8 @@ class LayerTreeHostOcclusionTest : public LayerTreeTest { void SetLayerPropertiesForTesting(TestLayer* layer, TestLayer* parent, const gfx::Transform& transform, - gfx::PointF position, - gfx::Size bounds, + const gfx::PointF& position, + const gfx::Size& bounds, bool opaque) const { layer->RemoveAllChildren(); if (parent) @@ -96,8 +95,6 @@ class LayerTreeHostOcclusionTest : public LayerTreeTest { layer->SetPosition(position); layer->SetBounds(bounds); layer->SetContentsOpaque(opaque); - - layer->SetAnchorPoint(gfx::PointF()); } protected: |