cc: Chromify Layer and LayerImpl classes.

cc/layer_tree_host_common.h

 // Copyright 2011 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_TREE_HOST_COMMON_H_
 #define CC_LAYER_TREE_HOST_COMMON_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/cc_export.h"
 #include "cc/scoped_ptr_vector.h"
@@ skipping 56 matching lines @@
 bool LayerTreeHostCommon::renderSurfaceContributesToTarget(LayerType* layer, int targetSurfaceLayerID)
 {
     // A layer will either contribute its own content, or its render surface's content, to
     // the target surface. The layer contributes its surface's content when both the
     // following are true:
     //  (1) The layer actually has a renderSurface, and
     //  (2) The layer's renderSurface is not the same as the targetSurface.
     //
     // Otherwise, the layer just contributes itself to the target surface.
 
-    return layer->renderSurface() && layer->id() != targetSurfaceLayerID;
+    return layer->render_surface() && layer->id() != targetSurfaceLayerID;
 }
 
 template<typename LayerType>
 LayerType* LayerTreeHostCommon::findLayerInSubtree(LayerType* rootLayer, int layerId)
 {
     if (rootLayer->id() == layerId)
         return rootLayer;
 
-    if (rootLayer->maskLayer() && rootLayer->maskLayer()->id() == layerId)
-        return rootLayer->maskLayer();
+    if (rootLayer->mask_layer() && rootLayer->mask_layer()->id() == layerId)
+        return rootLayer->mask_layer();
 
-    if (rootLayer->replicaLayer() && rootLayer->replicaLayer()->id() == layerId)
-        return rootLayer->replicaLayer();
+    if (rootLayer->replica_layer() && rootLayer->replica_layer()->id() == layerId)
+        return rootLayer->replica_layer();
 
     for (size_t i = 0; i < rootLayer->children().size(); ++i) {
         if (LayerType* found = findLayerInSubtree(getChildAsRawPtr(rootLayer->children(), i), layerId))
             return found;
     }
     return 0;
 }
 
 template<class Function, typename LayerType>
 void LayerTreeHostCommon::callFunctionForSubtree(LayerType* rootLayer)
 {
     Function()(rootLayer);
    
-    if (LayerType* maskLayer = rootLayer->maskLayer())
+    if (LayerType* maskLayer = rootLayer->mask_layer())
         Function()(maskLayer);
-    if (LayerType* replicaLayer = rootLayer->replicaLayer()) {
+    if (LayerType* replicaLayer = rootLayer->replica_layer()) {
         Function()(replicaLayer);
-        if (LayerType* maskLayer = replicaLayer->maskLayer())
+        if (LayerType* maskLayer = replicaLayer->mask_layer())
             Function()(maskLayer);
     }
 
     for (size_t i = 0; i < rootLayer->children().size(); ++i)
         callFunctionForSubtree<Function>(getChildAsRawPtr(rootLayer->children(), i));
 }
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_COMMON_H_