Update from https://crrev.com/312398

cc/resources/picture.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_H_
 #define CC_RESOURCES_PICTURE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "skia/ext/refptr.h"
-#include "third_party/skia/include/core/SkBBHFactory.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
 
 class SkDrawPictureCallback;
 class SkPixelRef;
 
 namespace base {
 class Value;
 }
 
@@ skipping 12 matching lines @@
   typedef std::vector<SkPixelRef*> PixelRefs;
   typedef base::hash_map<PixelRefMapKey, PixelRefs> PixelRefMap;
 
   enum RecordingMode {
     RECORD_NORMALLY,
     RECORD_WITH_SK_NULL_CANVAS,
     RECORD_WITH_PAINTING_DISABLED,
     RECORDING_MODE_COUNT,  // Must be the last entry.
   };
 
-  static scoped_refptr<Picture> Create(
-      const gfx::Rect& layer_rect,
-      ContentLayerClient* client,
-      const SkTileGridFactory::TileGridInfo& tile_grid_info,
-      bool gather_pixels_refs,
-      RecordingMode recording_mode);
+  static scoped_refptr<Picture> Create(const gfx::Rect& layer_rect,
+                                       ContentLayerClient* client,
+                                       const gfx::Size& tile_grid_size,
+                                       bool gather_pixels_refs,
+                                       RecordingMode recording_mode);
   static scoped_refptr<Picture> CreateFromValue(const base::Value* value);
   static scoped_refptr<Picture> CreateFromSkpValue(const base::Value* value);
 
   gfx::Rect LayerRect() const { return layer_rect_; }
 
   // Has Record() been called yet?
   bool HasRecording() const { return picture_.get() != NULL; }
 
   bool IsSuitableForGpuRasterization(const char** reason) const;
   int ApproximateOpCount() const;
@@ skipping 64 matching lines @@
   Picture(const skia::RefPtr<SkPicture>&,
           const gfx::Rect& layer_rect,
           const PixelRefMap& pixel_refs);
   // This constructor will call AdoptRef on the SkPicture.
   Picture(SkPicture*, const gfx::Rect& layer_rect);
   ~Picture();
 
   // Record a paint operation. To be able to safely use this SkPicture for
   // playback on a different thread this can only be called once.
   void Record(ContentLayerClient* client,
-              const SkTileGridFactory::TileGridInfo& tile_grid_info,
+              const gfx::Size& tile_grid_size,
               RecordingMode recording_mode);
 
   // Gather pixel refs from recording.
-  void GatherPixelRefs(const SkTileGridFactory::TileGridInfo& tile_grid_info);
+  void GatherPixelRefs(const gfx::Size& tile_grid_info);
 
   gfx::Rect layer_rect_;
   skia::RefPtr<SkPicture> picture_;
 
   PixelRefMap pixel_refs_;
   gfx::Point min_pixel_cell_;
   gfx::Point max_pixel_cell_;
   gfx::Size cell_size_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat>
     AsTraceableRasterData(float scale) const;
   scoped_refptr<base::debug::ConvertableToTraceFormat>
     AsTraceableRecordData() const;
 
   friend class base::RefCountedThreadSafe<Picture>;
   friend class PixelRefIterator;
   DISALLOW_COPY_AND_ASSIGN(Picture);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_H_