Add optional overdraw parameter to skia benchmarking extension

content/renderer/skia_benchmarking_extension.cc

 // Copyright (c) 2013 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 "content/renderer/skia_benchmarking_extension.h"
 
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/resources/picture.h"
@@ skipping 38 matching lines @@
         "  chrome = {};"
         "};"
         "if (typeof(chrome.skiaBenchmarking) == 'undefined') {"
         "  chrome.skiaBenchmarking = {};"
         "};"
         "chrome.skiaBenchmarking.rasterize = function(picture, params) {"
         "  /* "
         "     Rasterizes a Picture JSON-encoded by cc::Picture::AsValue()."
         "     @param {Object} picture A json-encoded cc::Picture."
         "     @param {"
-        "                 'scale':  {Number},"
-        "                 'stop':   {Number},"
-        "                 'clip':   [Number, Number, Number, Number]"
+        "                 'scale':    {Number},"
+        "                 'stop':     {Number},"
+        "                 'overdraw': {Boolean},"
+        "                 'clip':     [Number, Number, Number, Number]"
         "     } (optional) Rasterization parameters."
         "     @returns {"
-        "                 'width':  {Number},"
-        "                 'height': {Number},"
-        "                 'data':   {ArrayBuffer}"
+        "                 'width':    {Number},"
+        "                 'height':   {Number},"
+        "                 'data':     {ArrayBuffer}"
         "     }"
         "     @returns undefined if the arguments are invalid or the picture"
         "                        version is not supported."
         "   */"
         "  native function Rasterize();"
         "  return Rasterize(picture, params);"
         "};"
         "chrome.skiaBenchmarking.getOps = function(picture) {"
         "  /* "
         "     Extracts the Skia draw commands from a JSON-encoded cc::Picture"
@@ skipping 36 matching lines @@
     if (args.Length() < 1)
       return;
 
     scoped_refptr<cc::Picture> picture = ParsePictureArg(args[0]);
     if (!picture.get())
       return;
 
     double scale = 1.0;
     gfx::Rect clip_rect(picture->LayerRect());
     int stop_index = -1;
+    bool overdraw = false;
 
     if (args.Length() > 1) {
       scoped_ptr<content::V8ValueConverter> converter(
           content::V8ValueConverter::create());
       scoped_ptr<base::Value> params_value(
           converter->FromV8Value(args[1], v8::Context::GetCurrent()));
 
       const base::DictionaryValue* params_dict = NULL;
       if (params_value.get() && params_value->GetAsDictionary(&params_dict)) {
         params_dict->GetDouble("scale", &scale);
         params_dict->GetInteger("stop", &stop_index);
+        params_dict->GetBoolean("overdraw", &overdraw);
 
         const base::Value* clip_value = NULL;
         if (params_dict->Get("clip", &clip_value))
           cc::MathUtil::FromValue(clip_value, &clip_rect);
       }
     }
 
     gfx::RectF clip(clip_rect);
     clip.Intersect(picture->LayerRect());
     clip.Scale(scale);
@@ skipping 19 matching lines @@
     canvas.translate(picture->LayerRect().x(),
                      picture->LayerRect().y());
 
     // First, build a debug canvas for the given picture.
     SkDebugCanvas debug_canvas(picture->LayerRect().width(),
                                picture->LayerRect().height());
     picture->Replay(&debug_canvas);
 
     // Raster the requested command subset into the bitmap-backed canvas.
     int last_index = debug_canvas.getSize() - 1;
+    debug_canvas.setOverdrawViz(overdraw);
     debug_canvas.drawTo(&canvas, stop_index < 0
                         ? last_index
                         : std::min(last_index, stop_index));
 
     WebKit::WebArrayBuffer buffer =
         WebKit::WebArrayBuffer::create(bitmap.getSize(), 1);
     uint32* packed_pixels = reinterpret_cast<uint32*>(bitmap.getPixels());
     uint8* buffer_pixels = reinterpret_cast<uint8*>(buffer.data());
     // Swizzle from native Skia format to RGBA as we copy out.
     for (size_t i = 0; i < bitmap.getSize(); i += 4) {
@@ skipping 104 matching lines @@
     // FIXME: remove this after Skia updates SkGraphics::Init() to be
     //        thread-safe and idempotent.
     static bool skia_initialized = false;
     if (!skia_initialized) {
       SkGraphics::Init();
       skia_initialized = true;
     }
 }
 
 } // namespace content