Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/resources/tile.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_H_
 #define CC_RESOURCES_TILE_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/base/ref_counted_managed.h"
 #include "cc/resources/raster_source.h"
@@ skipping 70 matching lines @@
   void set_required_for_draw(bool is_required) {
     required_for_draw_ = is_required;
   }
 
   bool use_picture_analysis() const {
     return !!(flags_ & USE_PICTURE_ANALYSIS);
   }
 
   bool HasResource() const { return draw_info_.has_resource(); }
   bool NeedsRaster() const {
-    return draw_info_.mode() == TileDrawInfo::OOM_MODE ||
+    return draw_info_.mode() == TileDrawInfo::PICTURE_PILE_MODE ||
            !draw_info_.IsReadyToDraw();
   }
 
   void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   inline bool IsReadyToDraw() const { return draw_info_.IsReadyToDraw(); }
 
   const TileDrawInfo& draw_info() const { return draw_info_; }
 
   TileDrawInfo& draw_info() { return draw_info_; }
@@ skipping 41 matching lines @@
        int source_frame_number,
        int flags);
   ~Tile();
 
   bool HasRasterTask() const { return !!raster_task_.get(); }
 
   scoped_refptr<RasterSource> raster_source_;
   gfx::Size desired_texture_size_;
   gfx::Rect content_rect_;
   float contents_scale_;
-  bool is_occluded_[LAST_TREE + 1];
+  bool is_occluded_[NUM_TREES];
 
-  TilePriority priority_[LAST_TREE + 1];
+  TilePriority priority_[NUM_TREES];
   TileDrawInfo draw_info_;
 
   int layer_id_;
   int source_frame_number_;
   int flags_;
   int tiling_i_index_;
   int tiling_j_index_;
   bool is_shared_ : 1;
   bool required_for_activation_ : 1;
   bool required_for_draw_ : 1;
 
   Id id_;
   static Id s_next_id_;
 
   unsigned scheduled_priority_;
 
   scoped_refptr<RasterTask> raster_task_;
 
   DISALLOW_COPY_AND_ASSIGN(Tile);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_H_