Fixing tile grid size used by cc:Picture to make it respect current tile configuration

cc/picture_pile_base.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_PICTURE_PILE_BASE_H_
 #define CC_PICTURE_PILE_BASE_H_
 
 #include <list>
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "cc/cc_export.h"
 #include "cc/hash_pair.h"
 #include "cc/picture.h"
 #include "cc/region.h"
 #include "cc/tiling_data.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
 
+class LayerTreeHost;
+class LayerTreeHostImpl;
+class LayerTreeSettings;
+
 class CC_EXPORT PicturePileBase : public base::RefCounted<PicturePileBase> {
  public:
   PicturePileBase();
 
   void Resize(gfx::Size size);
   gfx::Size size() const { return tiling_.total_size(); }
   void SetMinContentsScale(float min_contents_scale);
 
   void PushPropertiesTo(PicturePileBase* other);
 
   void UpdateRecordedRegion();
   const Region& recorded_region() const { return recorded_region_; }
 
   int num_tiles_x() const { return tiling_.num_tiles_x(); }
   int num_tiles_y() const { return tiling_.num_tiles_y(); }
   gfx::Rect tile_bounds(int x, int y) const { return tiling_.TileBounds(x, y); }
   bool HasRecordingAt(int x, int y);
 
+  void ApplyLayerTreeSettings(LayerTreeHost* host);
+  void ApplyLayerTreeSettings(LayerTreeHostImpl* host_impl);  // for testing

[enne (OOO), 2013/02/25 23:59:15]

Could you just directly pass in the values you need here rather than exposing
LTH(I) to PicturePile?

+
  protected:
   virtual ~PicturePileBase();
 
   int buffer_pixels() const { return tiling_.border_texels(); }
   void Clear();
 
   typedef std::pair<int, int> PictureListMapKey;
   typedef std::list<scoped_refptr<Picture> > PictureList;
   typedef base::hash_map<PictureListMapKey, PictureList> PictureListMap;
 
   // A picture pile is a tiled set of picture lists.  The picture list map
   // is a map of tile indices to picture lists.
   PictureListMap picture_list_map_;
   TilingData tiling_;
   Region recorded_region_;
   float min_contents_scale_;
+  SkTileGridPicture::TileGridInfo tile_grid_info_;
 
  private:
+  void ApplyLayerTreeSettings(const LayerTreeSettings& settings, float scale);
   void SetBufferPixels(int buffer_pixels);
 
   friend class base::RefCounted<PicturePileBase>;
   DISALLOW_COPY_AND_ASSIGN(PicturePileBase);
 };
 
 }  // namespace cc
 
 #endif  // CC_PICTURE_PILE_H_