| Index: cc/quad_culler.cc
|
| diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
|
| index 2f3e18ff6a1e8cf601819df954cae0cc8423d16b..41c15504cd29ab072834a40fc9f04d166603ed41 100644
|
| --- a/cc/quad_culler.cc
|
| +++ b/cc/quad_culler.cc
|
| @@ -18,7 +18,7 @@ using namespace std;
|
|
|
| namespace cc {
|
|
|
| -QuadCuller::QuadCuller(QuadList& quadList, SharedQuadStateList& sharedQuadStateList, const LayerImpl* layer, const OcclusionTrackerImpl* occlusionTracker, bool showCullingWithDebugBorderQuads, bool forSurface)
|
| +QuadCuller::QuadCuller(QuadList& quadList, SharedQuadStateList& sharedQuadStateList, const LayerImpl* layer, const OcclusionTrackerImpl& occlusionTracker, bool showCullingWithDebugBorderQuads, bool forSurface)
|
| : m_quadList(quadList)
|
| , m_sharedQuadStateList(sharedQuadStateList)
|
| , m_currentSharedQuadState(0)
|
| @@ -73,13 +73,13 @@ bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData& appendQu
|
| bool implDrawTransformIsUnknown = false;
|
|
|
| if (m_forSurface)
|
| - culledRect = m_occlusionTracker->unoccludedContributingSurfaceContentRect(m_layer, false, drawQuad->rect, &hasOcclusionFromOutsideTargetSurface);
|
| + culledRect = m_occlusionTracker.unoccludedContributingSurfaceContentRect(m_layer, false, drawQuad->rect, &hasOcclusionFromOutsideTargetSurface);
|
| else
|
| - culledRect = m_occlusionTracker->unoccludedContentRect(m_layer->renderTarget(), drawQuad->rect, drawQuad->quadTransform(), implDrawTransformIsUnknown, drawQuad->clippedRectInTarget(), &hasOcclusionFromOutsideTargetSurface);
|
| + culledRect = m_occlusionTracker.unoccludedContentRect(m_layer->renderTarget(), drawQuad->rect, drawQuad->quadTransform(), implDrawTransformIsUnknown, drawQuad->clippedRectInTarget(), &hasOcclusionFromOutsideTargetSurface);
|
|
|
| appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;
|
|
|
| - return appendQuadInternal(drawQuad.Pass(), culledRect, m_quadList, *m_occlusionTracker, m_layer, m_showCullingWithDebugBorderQuads);
|
| + return appendQuadInternal(drawQuad.Pass(), culledRect, m_quadList, m_occlusionTracker, m_layer, m_showCullingWithDebugBorderQuads);
|
| }
|
|
|
| } // namespace cc
|
|
|