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

cc/picture.cc

 // 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.
 
 #include "base/debug/trace_event.h"
 #include "cc/content_layer_client.h"
 #include "cc/picture.h"
 #include "cc/rendering_stats.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkTileGridPicture.h"
 #include "third_party/skia/include/utils/SkPictureUtils.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
 namespace {
 // URI label for a lazily decoded SkPixelRef.
 const char labelLazyDecoded[] = "lazy";
-// Tile size in recording coordinates used by SkTileGridPicture
-const int tileGridSize = 256;
 }
 
 namespace cc {
 
 scoped_refptr<Picture> Picture::Create(gfx::Rect layer_rect) {
   return make_scoped_refptr(new Picture(layer_rect));
 }
 
 Picture::Picture(gfx::Rect layer_rect)
     : layer_rect_(layer_rect) {
@@ skipping 12 matching lines @@
 
 scoped_refptr<Picture> Picture::Clone() const {
   // SkPicture is not thread-safe to rasterize with, so return a thread-safe
   // clone of it.
   DCHECK(picture_);
   skia::RefPtr<SkPicture> clone = skia::AdoptRef(picture_->clone());
   return make_scoped_refptr(new Picture(clone, layer_rect_, opaque_rect_));
 }
 
 void Picture::Record(ContentLayerClient* painter,
-                     RenderingStats* stats) {
+                     RenderingStats* stats,
+                     const SkTileGridPicture::TileGridInfo& tileGridInfo) {
   TRACE_EVENT2("cc", "Picture::Record",
                "width", layer_rect_.width(), "height", layer_rect_.height());
 
   // Record() should only be called once.
   DCHECK(!picture_);
   picture_ = skia::AdoptRef(new SkTileGridPicture(
-      tileGridSize, tileGridSize, layer_rect_.width(), layer_rect_.height()));
+      layer_rect_.width(), layer_rect_.height(), tileGridInfo));
 
   SkCanvas* canvas = picture_->beginRecording(
       layer_rect_.width(),
       layer_rect_.height(),
       SkPicture::kUsePathBoundsForClip_RecordingFlag |
       SkPicture::kOptimizeForClippedPlayback_RecordingFlag);
 
   canvas->save();
   canvas->translate(SkFloatToScalar(-layer_rect_.x()),
                     SkFloatToScalar(-layer_rect_.y()));
@@ skipping 77 matching lines @@
     if (*refs && (*refs)->getURI() && !strncmp(
         (*refs)->getURI(), labelLazyDecoded, 4)) {
       pixel_ref_list.push_back(static_cast<skia::LazyPixelRef*>(*refs));
     }
     refs++;
   }
   pixel_refs->unref();
 }
 
 }  // namespace cc