cc: Add DEFINE_ENUM macro.

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 "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/base/util.h"
 #include "cc/resources/picture_pile.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.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,
-  NUM_TREES = 2
-  // Be sure to update WhichTreeAsValue when adding new fields.
-};
-scoped_ptr<base::Value> WhichTreeAsValue(
-    WhichTree tree);
+DEFINE_ENUM(WhichTree,
+            ACTIVE_TREE,
+            PENDING_TREE);
+scoped_ptr<base::Value> WhichTreeAsValue(WhichTree tree);
 
 enum TileResolution {
-  LOW_RESOLUTION = 0 ,
+  LOW_RESOLUTION = 0,
   HIGH_RESOLUTION = 1,
-  NON_IDEAL_RESOLUTION = 2,
+  NON_IDEAL_RESOLUTION = 2
 };
-scoped_ptr<base::Value> TileResolutionAsValue(
-    TileResolution resolution);
+scoped_ptr<base::Value> TileResolutionAsValue(TileResolution resolution);
 
 struct CC_EXPORT TilePriority {
   TilePriority()
       : resolution(NON_IDEAL_RESOLUTION),
         required_for_activation(false),
         time_to_visible_in_seconds(std::numeric_limits<float>::infinity()),
         distance_to_visible_in_pixels(std::numeric_limits<float>::infinity()) {}
 
   TilePriority(TileResolution resolution,
                float time_to_visible_in_seconds,
@@ skipping 65 matching lines @@
 
   TileResolution resolution;
   bool required_for_activation;
   float time_to_visible_in_seconds;
   float distance_to_visible_in_pixels;
 
  private:
   gfx::QuadF current_screen_quad;
 };
 
-enum TileMemoryLimitPolicy {
-  // Nothing.
-  ALLOW_NOTHING = 0,
+// NOTE: Be sure to update kBinPolicyMap when adding fields.
+DEFINE_ENUM(TileMemoryLimitPolicy,
+            // Nothing.
+            ALLOW_NOTHING,
 
-  // You might be made visible, but you're not being interacted with.
-  ALLOW_ABSOLUTE_MINIMUM = 1,  // Tall.
+            // You might be made visible, but you're not being interacted with.
+            ALLOW_ABSOLUTE_MINIMUM,  // Tall.
 
-  // You're being interacted with, but we're low on memory.
-  ALLOW_PREPAINT_ONLY = 2,  // Grande.
+            // You're being interacted with, but we're low on memory.
+            ALLOW_PREPAINT_ONLY,  // Grande.
 
-  // You're the only thing in town. Go crazy.
-  ALLOW_ANYTHING = 3,  // Venti.
-
-  NUM_TILE_MEMORY_LIMIT_POLICIES = 4,
-
-  // NOTE: Be sure to update TreePriorityAsValue and kBinPolicyMap when adding
-  // or reordering fields.
-};
+            // You're the only thing in town. Go crazy.
+            ALLOW_ANYTHING);  // Venti.
 scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
     TileMemoryLimitPolicy policy);
 
 enum TreePriority {
   SAME_PRIORITY_FOR_BOTH_TREES,
   SMOOTHNESS_TAKES_PRIORITY,
   NEW_CONTENT_TAKES_PRIORITY
-
-  // Be sure to update TreePriorityAsValue when adding new fields.
 };
 scoped_ptr<base::Value> TreePriorityAsValue(TreePriority prio);
 
 class GlobalStateThatImpactsTilePriority {
  public:
   GlobalStateThatImpactsTilePriority()
       : memory_limit_policy(ALLOW_NOTHING),
         memory_limit_in_bytes(0),
         unused_memory_limit_in_bytes(0),
         num_resources_limit(0),
         tree_priority(SAME_PRIORITY_FOR_BOTH_TREES) {}
 
   TileMemoryLimitPolicy memory_limit_policy;
 
   size_t memory_limit_in_bytes;
   size_t unused_memory_limit_in_bytes;
   size_t num_resources_limit;
 
   TreePriority tree_priority;
 
   scoped_ptr<base::Value> AsValue() const;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_PRIORITY_H_