Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/resources/tile_draw_info.h

 // Copyright 2013 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_DRAW_INFO_H_
 #define CC_RESOURCES_TILE_DRAW_INFO_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/tile_task_runner.h"
 
 namespace cc {
 
 // This class holds all the state relevant to drawing a tile.
 class CC_EXPORT TileDrawInfo {
  public:
-  enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, OOM_MODE };
+  enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, PICTURE_PILE_MODE };
 
   TileDrawInfo();
   ~TileDrawInfo();
 
   Mode mode() const { return mode_; }
 
   bool IsReadyToDraw() const;
 
   ResourceProvider::ResourceId resource_id() const {
     DCHECK(mode_ == RESOURCE_MODE);
@@ skipping 11 matching lines @@
     DCHECK(mode_ == SOLID_COLOR_MODE);
     return solid_color_;
   }
 
   bool contents_swizzled() const {
     DCHECK(resource_);
     return !PlatformColor::SameComponentOrder(resource_->format());
   }
 
   bool requires_resource() const {
-    return mode_ == RESOURCE_MODE || mode_ == OOM_MODE;
+    return mode_ == RESOURCE_MODE || mode_ == PICTURE_PILE_MODE;
   }
 
   inline bool has_resource() const { return !!resource_; }
 
   void SetSolidColorForTesting(SkColor color) { set_solid_color(color); }
   void SetResourceForTesting(scoped_ptr<ScopedResource> resource) {
     resource_ = resource.Pass();
   }
 
   void AsValueInto(base::trace_event::TracedValue* state) const;
 
  private:
   friend class Tile;
   friend class TileManager;
 
   void set_use_resource() { mode_ = RESOURCE_MODE; }
 
   void set_solid_color(const SkColor& color) {
     mode_ = SOLID_COLOR_MODE;
     solid_color_ = color;
   }
 
-  void set_oom() { mode_ = OOM_MODE; }
+  void set_rasterize_on_demand() { mode_ = PICTURE_PILE_MODE; }
 
   Mode mode_;
   SkColor solid_color_;
   scoped_ptr<ScopedResource> resource_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_DRAW_INFO_H_