Merge 241994 "Revert "cc: Added tile bundles""

cc/resources/picture_layer_tiling_set.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_PICTURE_LAYER_TILING_SET_H_
 #define CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/resources/picture_layer_tiling.h"
@@ skipping 77 matching lines @@
     // regardless of the relative contents scale of the tiling.
     gfx::Rect geometry_rect() const;
     // Texture rect (in texels) for geometry_rect
     gfx::RectF texture_rect() const;
     // Texture size in texels
     gfx::Size texture_size() const;
 
     Tile* operator->() const;
     Tile* operator*() const;
 
-    TilePriority priority();
-
     CoverageIterator& operator++();
     operator bool() const;
 
     PictureLayerTiling* CurrentTiling();
 
    private:
     int NextTiling() const;
 
     const PictureLayerTilingSet* set_;
     float contents_scale_;
@@ skipping 15 matching lines @@
   gfx::Size layer_bounds_;
   ScopedPtrVector<PictureLayerTiling> tilings_;
 
   friend class Iterator;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_