Revert 192259

cc/resources/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/debug/rendering_stats.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/resources/picture.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 69 matching lines @@
 
 void Picture::Record(ContentLayerClient* painter,
                      RenderingStats* stats,
                      const SkTileGridPicture::TileGridInfo& tile_grid_info) {
   TRACE_EVENT2("cc", "Picture::Record",
                "width", layer_rect_.width(), "height", layer_rect_.height());
 
   // Record() should only be called once.
   DCHECK(!picture_);
   DCHECK(!tile_grid_info.fTileInterval.isEmpty());
-  // TODO(enne): Turn back on tile grid after
-  // https://code.google.com/p/skia/issues/detail?id=1209 is fixed.
-  picture_ = skia::AdoptRef(new SkPicture());
+  picture_ = skia::AdoptRef(new SkTileGridPicture(
+      layer_rect_.width(), layer_rect_.height(), tile_grid_info));
 
   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 70 matching lines @@
     if (*refs && (*refs)->getURI() && !strncmp(
         (*refs)->getURI(), kLabelLazyDecoded, 4)) {
       pixel_ref_list.push_back(static_cast<skia::LazyPixelRef*>(*refs));
     }
     refs++;
   }
   pixel_refs->unref();
 }
 
 }  // namespace cc