cc: Chromify Layer and LayerImpl classes.

cc/quad_culler.cc

Index: cc/quad_culler.cc
diff --git a/cc/quad_culler.cc b/cc/quad_culler.cc
index cc070e480b6554315f3707e102246bef543d3045..b3bfebde71ffcb679cc1f88e6501b4b2ea8cdb48 100644
--- a/cc/quad_culler.cc
+++ b/cc/quad_culler.cc
@@ -48,7 +48,7 @@ static inline bool appendQuadInternal(scoped_ptr<DrawQuad> drawQuad, const gfx::
     if (keepQuad) {
         if (createDebugBorderQuads && !drawQuad->IsDebugQuad() && drawQuad->visible_rect != drawQuad->rect) {
             SkColor color = DebugColors::CulledTileBorderColor();
-            float width = DebugColors::CulledTileBorderWidth(layer ? layer->layerTreeImpl() : NULL);
+            float width = DebugColors::CulledTileBorderWidth(layer ? layer->layer_tree_impl() : NULL);
             scoped_ptr<DebugBorderDrawQuad> debugBorderQuad = DebugBorderDrawQuad::Create();
             debugBorderQuad->SetNew(drawQuad->shared_quad_state, drawQuad->visible_rect, color, width);
             quadList.push_back(debugBorderQuad.PassAs<DrawQuad>());
@@ -60,7 +60,7 @@ static inline bool appendQuadInternal(scoped_ptr<DrawQuad> drawQuad, const gfx::
     return keepQuad;
 }
 
-bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData& appendQuadsData)
+bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData* appendQuadsData)
 {
     DCHECK(drawQuad->shared_quad_state == m_currentSharedQuadState);
     DCHECK(!m_sharedQuadStateList.empty());
@@ -73,9 +73,9 @@ bool QuadCuller::append(scoped_ptr<DrawQuad> drawQuad, AppendQuadsData& appendQu
     if (m_forSurface)
         culledRect = m_occlusionTracker.UnoccludedContributingSurfaceContentRect(m_layer, false, drawQuad->rect, &hasOcclusionFromOutsideTargetSurface);
     else
-        culledRect = m_occlusionTracker.UnoccludedContentRect(m_layer->renderTarget(), drawQuad->rect, drawQuad->quadTransform(), implDrawTransformIsUnknown, drawQuad->isClipped(), drawQuad->clipRect(), &hasOcclusionFromOutsideTargetSurface);
+        culledRect = m_occlusionTracker.UnoccludedContentRect(m_layer->render_target(), drawQuad->rect, drawQuad->quadTransform(), implDrawTransformIsUnknown, drawQuad->isClipped(), drawQuad->clipRect(), &hasOcclusionFromOutsideTargetSurface);
 
-    appendQuadsData.hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;
+    appendQuadsData->hadOcclusionFromOutsideTargetSurface |= hasOcclusionFromOutsideTargetSurface;
 
     return appendQuadInternal(drawQuad.Pass(), culledRect, m_quadList, m_occlusionTracker, m_layer, m_showCullingWithDebugBorderQuads);
 }