Update from https://crrev.com/312398

cc/resources/picture_pile.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_PILE_H_
 #define CC_RESOURCES_PICTURE_PILE_H_
 
 #include <bitset>
 #include <utility>
 #include <vector>
@@ skipping 21 matching lines @@
       int frame_number,
       Picture::RecordingMode recording_mode) override;
   scoped_refptr<RasterSource> CreateRasterSource() const override;
   gfx::Size GetSize() const final;
   void SetEmptyBounds() override;
   void SetMinContentsScale(float min_contents_scale) override;
   void SetSlowdownRasterScaleFactor(int factor) override;
   bool IsSuitableForGpuRasterization() const override;
   void SetTileGridSize(const gfx::Size& tile_grid_size) override;
   void SetUnsuitableForGpuRasterizationForTesting() override;
-  SkTileGridFactory::TileGridInfo GetTileGridInfoForTesting() const override;
-
-  static void ComputeTileGridInfo(const gfx::Size& tile_grid_size,
-                                  SkTileGridFactory::TileGridInfo* info);
+  gfx::Size GetTileGridSizeForTesting() const override;
 
  protected:
   class CC_EXPORT PictureInfo {
    public:
     enum { INVALIDATION_FRAMES_TRACKED = 32 };
 
     PictureInfo();
     ~PictureInfo();
 
     bool Invalidate(int frame_number);
@@ skipping 31 matching lines @@
   // A picture pile is a tiled set of pictures. The picture map is a map of tile
   // indices to picture infos.
   PictureMap picture_map_;
   TilingData tiling_;
 
   // If non-empty, all pictures tiles inside this rect are recorded. There may
   // be recordings outside this rect, but everything inside the rect is
   // recorded.
   gfx::Rect recorded_viewport_;
   float min_contents_scale_;
-  SkTileGridFactory::TileGridInfo tile_grid_info_;
+  gfx::Size tile_grid_size_;
   int slow_down_raster_scale_factor_for_debug_;
   bool can_use_lcd_text_;
   // A hint about whether there are any recordings. This may be a false
   // positive.
   bool has_any_recordings_;
   bool is_solid_color_;
   SkColor solid_color_;
   int pixel_record_distance_;
 
  private:
@@ skipping 16 matching lines @@
   void SetBufferPixels(int buffer_pixels);
 
   bool is_suitable_for_gpu_rasterization_;
 
   DISALLOW_COPY_AND_ASSIGN(PicturePile);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_PILE_H_