Index: cc/test/CCOcclusionTrackerTestCommon.h |
diff --git a/cc/test/CCOcclusionTrackerTestCommon.h b/cc/test/CCOcclusionTrackerTestCommon.h |
index 14f20916fc2111b1cd2fa26ba27547e7c20eb5f5..547d2afae6b9dbd45b2253818ae82c46f0fb80de 100644 |
--- a/cc/test/CCOcclusionTrackerTestCommon.h |
+++ b/cc/test/CCOcclusionTrackerTestCommon.h |
@@ -2,36 +2,5 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CCOcclusionTrackerTestCommon_h |
-#define CCOcclusionTrackerTestCommon_h |
- |
-#include "CCOcclusionTracker.h" |
-#include "CCRenderSurface.h" |
-#include "IntRect.h" |
-#include "Region.h" |
-#include "RenderSurfaceChromium.h" |
- |
-namespace WebKitTests { |
- |
-// A subclass to expose the total current occlusion. |
-template<typename LayerType, typename RenderSurfaceType> |
-class TestCCOcclusionTrackerBase : public cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType> { |
-public: |
- TestCCOcclusionTrackerBase(cc::IntRect screenScissorRect, bool recordMetricsForFrame = false) |
- : cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame) |
- { |
- } |
- |
- cc::Region occlusionInScreenSpace() const { return cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen; } |
- cc::Region occlusionInTargetSurface() const { return cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget; } |
- |
- void setOcclusionInScreenSpace(const cc::Region& region) { cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInScreen = region; } |
- void setOcclusionInTargetSurface(const cc::Region& region) { cc::CCOcclusionTrackerBase<LayerType, RenderSurfaceType>::m_stack.last().occlusionInTarget = region; } |
-}; |
- |
-typedef TestCCOcclusionTrackerBase<cc::LayerChromium, cc::RenderSurfaceChromium> TestCCOcclusionTracker; |
-typedef TestCCOcclusionTrackerBase<cc::CCLayerImpl, cc::CCRenderSurface> TestCCOcclusionTrackerImpl; |
- |
-} |
- |
-#endif // CCOcclusionTrackerTestCommon_h |
+// Temporary forwarding header |
+#include "cc/test/occlusion_tracker_test_common.h" |