cc: Chromify Layer and LayerImpl classes.

cc/layer_iterator.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYER_ITERATOR_H_
 #define CC_LAYER_ITERATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/cc_export.h"
 #include "cc/layer_tree_host_common.h"
@@ skipping 106 matching lines @@
         position.currentLayer = currentLayer();
         return position;
     }
 
 private:
     LayerIterator(const LayerList* renderSurfaceLayerList, bool start)
         : m_renderSurfaceLayerList(renderSurfaceLayerList)
         , m_targetRenderSurfaceLayerIndex(0)
     {
         for (size_t i = 0; i < renderSurfaceLayerList->size(); ++i) {
-            if (!(*renderSurfaceLayerList)[i]->renderSurface()) {
+            if (!(*renderSurfaceLayerList)[i]->render_surface()) {
                 NOTREACHED();
                 m_actions.end(*this);
                 return;
             }
         }
 
         if (start && !renderSurfaceLayerList->empty())
             m_actions.begin(*this);
         else
             m_actions.end(*this);
     }
 
     inline static Layer* getRawPtr(const scoped_refptr<Layer>& ptr) { return ptr.get(); }
     inline static LayerImpl* getRawPtr(LayerImpl* ptr) { return ptr; }
 
     inline LayerType* currentLayer() const { return currentLayerRepresentsTargetRenderSurface() ? targetRenderSurfaceLayer() : getRawPtr(targetRenderSurfaceChildren()[m_currentLayerIndex]); }
 
     inline bool currentLayerRepresentsContributingRenderSurface() const { return LayerTreeHostCommon::renderSurfaceContributesToTarget<LayerType>(currentLayer(), targetRenderSurfaceLayer()->id()); }
     inline bool currentLayerRepresentsTargetRenderSurface() const { return m_currentLayerIndex == LayerIteratorValue::LayerIndexRepresentingTargetRenderSurface; }
 
-    inline RenderSurfaceType* targetRenderSurface() const { return targetRenderSurfaceLayer()->renderSurface(); }
+    inline RenderSurfaceType* targetRenderSurface() const { return targetRenderSurfaceLayer()->render_surface(); }
     inline const LayerList& targetRenderSurfaceChildren() const { return targetRenderSurface()->layer_list(); }
 
     IteratorActionType m_actions;
     const LayerList* m_renderSurfaceLayerList;
 
     // The iterator's current position.
 
     // A position in the renderSurfaceLayerList. This points to a layer which owns the current target surface.
     // This is a value from 0 to n-1 (n = size of renderSurfaceLayerList = number of surfaces). A value outside of
     // this range (for example, LayerIteratorValue::InvalidTargetRenderSurfaceLayerIndex) is used to
@@ skipping 40 matching lines @@
 
     private:
         template <typename LayerType, typename LayerList, typename RenderSurfaceType, typename ActionType>
         void goToHighestInSubtree(LayerIterator<LayerType, LayerList, RenderSurfaceType, ActionType>&);
     };
 };
 
 } // namespace cc
 
 #endif  // CC_LAYER_ITERATOR_H_