Implemented printToSkPicture without using WebViewBenchmarkSupport.

cc/layers/picture_layer.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 "cc/layers/picture_layer.h"
 
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/debug/devtools_instrumentation.h"
+#include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/rect_conversions.h"
 
 namespace cc {
 
 scoped_refptr<PictureLayer> PictureLayer::Create(ContentLayerClient* client) {
   return make_scoped_refptr(new PictureLayer(client));
 }
 
@@ skipping 104 matching lines @@
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
 bool PictureLayer::SupportsLCDText() const {
   return true;
 }
 
+skia::RefPtr<SkPicture> PictureLayer::GetPicture() const {
+  // We could either return the SkPicture in picture-pile,

[enne (OOO), 2013/08/20 01:25:15]

This comment is a little misleading.  PicturePile has a number of SkPictures
with different clips and offsets.  Maybe say "We could either flatten the
PicturePile into a single SkPicture or..."?

[alokp, 2013/08/20 18:01:56]

Done.

+  // or paint a fresh one depending on what we intend to do with the
+  // picture. For now we just paint a fresh one to get consistent results.
+  if (!DrawsContent())

[enne (OOO), 2013/08/20 01:25:15]

Can you make this early out consistent with the ContentLayer one? I think in
both cases you could just check DrawsContent() as that requires a non-null
client_.

[alokp, 2013/08/20 18:01:56]

Done.

+    return skia::RefPtr<SkPicture>();
+
+  int width = bounds().width();
+  int height = bounds().height();
+  gfx::RectF opaque;
+
+  skia::RefPtr<SkPicture> picture = skia::AdoptRef(new SkPicture);
+  SkCanvas* canvas = picture->beginRecording(width, height);
+  client_->PaintContents(canvas, gfx::Rect(width, height), &opaque);
+  picture->endRecording();
+  return picture;
+}
+
 }  // namespace cc