Expose IsSolidColor and write units tests

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 "cc/resources/picture.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 199 matching lines @@
   // TODO(alokp): SkPicture::suitableForGpuRasterization needs a GrContext.
   // Ideally this GrContext should be the same as that for rasterizing this
   // picture. But we are on the main thread while the rasterization context
   // may be on the compositor or raster thread.
   // SkPicture::suitableForGpuRasterization is not implemented yet.
   // Pass a NULL context for now and discuss with skia folks if the context
   // is really needed.
   return picture_->suitableForGpuRasterization(NULL);
 }
 
+int Picture::approximateOpCount() const {
+  DCHECK(picture_);
+  return picture_->approximateOpCount();
+}
+
 void Picture::CloneForDrawing(int num_threads) {
   TRACE_EVENT1("cc", "Picture::CloneForDrawing", "num_threads", num_threads);
 
   // We don't need clones to draw from multiple threads with SkRecord.
   if (playback_) {
     return;
   }
 
   DCHECK(picture_);
   DCHECK(clones_.empty());
@@ skipping 180 matching lines @@
   }
   SkIRect bounds;
   canvas->getClipDeviceBounds(&bounds);
   canvas->restore();
   TRACE_EVENT_END1(
       "cc", "Picture::Raster",
       "num_pixels_rasterized", bounds.width() * bounds.height());
   return bounds.width() * bounds.height();
 }
 
+int Picture::AnalysisRaster(SkCanvas* canvas, SkDrawPictureCallback* callback) {
+  TRACE_EVENT0("cc", "Picture::AnalysisRaster");
+  DCHECK(picture_);
+
+  canvas->save();
+
+  canvas->translate(layer_rect_.x(), layer_rect_.y());
+  if (playback_) {
+    playback_->draw(canvas);
+  } else {
+    picture_->draw(canvas, callback);
+  }
+  SkIRect bounds;
+  canvas->getClipDeviceBounds(&bounds);
+  canvas->restore();
+  return bounds.width() * bounds.height();

[vmpstr, 2014/08/19 23:55:37]

If you're not using this, then let's just make this a void function.

[hendrikw, 2014/08/20 00:34:05]

ok, I also removed the callback, also not using that.

+}
+
 void Picture::Replay(SkCanvas* canvas) {
   if (!playback_)
     DCHECK(raster_thread_checker_.CalledOnValidThread());
   TRACE_EVENT_BEGIN0("cc", "Picture::Replay");
   DCHECK(picture_);
 
   if (playback_) {
     playback_->draw(canvas);
   } else {
     picture_->draw(canvas);
@@ skipping 169 matching lines @@
   scoped_refptr<base::debug::TracedValue> record_data =
       new base::debug::TracedValue();
   TracedValue::SetIDRef(this, record_data.get(), "picture_id");
   record_data->BeginArray("layer_rect");
   MathUtil::AddToTracedValue(layer_rect_, record_data.get());
   record_data->EndArray();
   return record_data;
 }
 
 }  // namespace cc