Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/trees/layer_sorter.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_TREES_LAYER_SORTER_H_
 #define CC_TREES_LAYER_SORTER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 50 matching lines @@
 
 
 
 class CC_EXPORT LayerSorter {
  public:
   LayerSorter();
   ~LayerSorter();
 
   void Sort(LayerImplList::iterator first, LayerImplList::iterator last);
 
-  enum ABCompareResult { A_BEFORE_B, B_BEFORE_A, NONE };
+  enum ABCompareResult {
+    ABeforeB,
+    BBeforeA,
+    None
+  };
 
   static ABCompareResult CheckOverlap(LayerShape* a,
                                       LayerShape* b,
                                       float z_threshold,
                                       float* weight);
 
  private:
   typedef std::vector<GraphNode> NodeList;
   typedef std::vector<GraphEdge> EdgeList;
   NodeList nodes_;
   EdgeList edges_;
   float z_range_;
 
   typedef base::hash_map<GraphEdge*, GraphEdge*> EdgeMap;
   EdgeMap active_edges_;
 
   void CreateGraphNodes(LayerImplList::iterator first,
                         LayerImplList::iterator last);
   void CreateGraphEdges();
   void RemoveEdgeFromList(GraphEdge* graph, std::vector<GraphEdge*>* list);
 
   DISALLOW_COPY_AND_ASSIGN(LayerSorter);
 };
 
 }  // namespace cc
 #endif  // CC_TREES_LAYER_SORTER_H_