cc: Disable use of Skia r-tree for impl-side painting

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 "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/rect_conversions.h"
@@ skipping 28 matching lines @@
 }
 
 void Picture::Record(ContentLayerClient* painter,
                      RenderingStats& stats) {
   TRACE_EVENT0("cc", "Picture::Record");
 
   // Record() should only be called once.
   DCHECK(!picture_);
   picture_ = skia::AdoptRef(new SkPicture);
 
+  // TODO(enne): Use SkPicture::kOptimizeForClippedPlayback_RecordingFlag
+  // once http://code.google.com/p/skia/issues/detail?id=1014 is fixed.
   SkCanvas* canvas = picture_->beginRecording(
       layer_rect_.width(),
-      layer_rect_.height(),
-      SkPicture::kOptimizeForClippedPlayback_RecordingFlag);
+      layer_rect_.height());
 
   canvas->save();
   canvas->translate(SkFloatToScalar(-layer_rect_.x()),
                     SkFloatToScalar(-layer_rect_.y()));
 
   SkPaint paint;
   paint.setAntiAlias(false);
   paint.setXfermodeMode(SkXfermode::kClear_Mode);
   SkRect layer_skrect = SkRect::MakeXYWH(layer_rect_.x(),
                                          layer_rect_.y(),
@@ skipping 19 matching lines @@
 void Picture::Raster(SkCanvas* canvas) {
   TRACE_EVENT0("cc", "Picture::Raster");
   DCHECK(picture_);
   canvas->save();
   canvas->translate(layer_rect_.x(), layer_rect_.y());
   canvas->drawPicture(*picture_);
   canvas->restore();
 }
 
 }  // namespace cc