Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/resources/tile_priority.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_RESOURCES_TILE_PRIORITY_H_
 #define CC_RESOURCES_TILE_PRIORITY_H_
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/cc_export.h"
 
 namespace base {
 class Value;
 }
 
 namespace cc {
 
 enum WhichTree {
   // Note: these must be 0 and 1 because we index with them in various places,
   // e.g. in Tile::priority_.
   ACTIVE_TREE = 0,
   PENDING_TREE = 1,
-  LAST_TREE = 1
+  NUM_TREES = 2
   // Be sure to update WhichTreeAsValue when adding new fields.
 };
 scoped_ptr<base::Value> WhichTreeAsValue(WhichTree tree);
 
 enum TileResolution {
   LOW_RESOLUTION = 0 ,
   HIGH_RESOLUTION = 1,
   NON_IDEAL_RESOLUTION = 2,
 };
 std::string TileResolutionToString(TileResolution resolution);
@@ skipping 73 matching lines @@
 
   // You're the only thing in town. Go crazy.
   ALLOW_ANYTHING = 3  // Venti.
 };
 std::string TileMemoryLimitPolicyToString(TileMemoryLimitPolicy policy);
 
 enum TreePriority {
   SAME_PRIORITY_FOR_BOTH_TREES,
   SMOOTHNESS_TAKES_PRIORITY,
   NEW_CONTENT_TAKES_PRIORITY,
-  LAST_TREE_PRIORITY = NEW_CONTENT_TAKES_PRIORITY
+  NUM_TREE_PRIORITIES
   // Be sure to update TreePriorityAsValue when adding new fields.
 };
 std::string TreePriorityToString(TreePriority prio);
 
 class GlobalStateThatImpactsTilePriority {
  public:
   GlobalStateThatImpactsTilePriority()
       : memory_limit_policy(ALLOW_NOTHING),
         soft_memory_limit_in_bytes(0),
         hard_memory_limit_in_bytes(0),
@@ skipping 18 matching lines @@
   bool operator!=(const GlobalStateThatImpactsTilePriority& other) const {
     return !(*this == other);
   }
 
   void AsValueInto(base::trace_event::TracedValue* dict) const;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_PRIORITY_H_