Add option for SKP capture without reencoding images

content/renderer/gpu/gpu_benchmarking_extension.cc

 // Copyright (c) 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 "content/renderer/gpu/gpu_benchmarking_extension.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
 #include "base/base64.h"
+#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/layers/layer.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_smooth_drag_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
 #include "content/public/child/v8_value_converter.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/renderer/chrome_object_extensions_utils.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/skia_benchmarking_extension.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "third_party/WebKit/public/web/WebImageCache.h"
@@ skipping 13 matching lines @@
 using blink::WebLocalFrame;
 using blink::WebImageCache;
 using blink::WebPrivatePtr;
 using blink::WebSize;
 using blink::WebView;
 
 namespace content {
 
 namespace {
 
-class PNGSerializer : public SkPixelSerializer {
+class EncodingSerializer : public SkPixelSerializer {
  protected:
   bool onUseEncodedData(const void* data, size_t len) override { return true; }
 
   SkData* onEncode(const SkPixmap& pixmap) override {
     SkBitmap bm;
     // The const_cast is fine, since we only read from the bitmap.
     if (bm.installPixels(pixmap.info(),
                          const_cast<void*>(pixmap.addr()),
                          pixmap.rowBytes())) {
       std::vector<unsigned char> vector;
-      if (gfx::PNGCodec::EncodeBGRASkBitmap(bm, false, &vector)) {
+
+      const base::CommandLine& commandLine =
+          *base::CommandLine::ForCurrentProcess();
+      if (commandLine.HasSwitch(switches::kSkipReencodingOnSKPCapture)) {
+        // In this case, we just want to store some useful information
+        // about the image to replace the missing encoded data.
+
+        // First make sure that the data does not accidentally match any
+        // image signatures.
+        vector.push_back(0xFF);
+        vector.push_back(0xFF);
+        vector.push_back(0xFF);
+        vector.push_back(0xFF);
+
+        // Save the width and height.
+        uint32_t width = bm.width();

[scroggo, 2016/02/17 23:13:30]

I think you can get all this info from the pixmap without ever calling
installPixels.

[msarett, 2016/02/18 16:44:39]

Restructured the code to check the flag before installing pixels.

+        uint32_t height = bm.height();
+        vector.push_back(width & 0xFF);
+        vector.push_back((width >> 8) & 0xFF);
+        vector.push_back((width >> 16) & 0xFF);
+        vector.push_back((width >> 24) & 0xFF);
+        vector.push_back(height & 0xFF);
+        vector.push_back((height >> 8) & 0xFF);
+        vector.push_back((height >> 16) & 0xFF);
+        vector.push_back((height >> 24) & 0xFF);
+
+        // Save any additional information about the bitmap that may be
+        // interesting.
+        vector.push_back(bm.colorType());
+        vector.push_back(bm.alphaType());
         return SkData::NewWithCopy(&vector.front(), vector.size());
+      } else {
+        if (gfx::PNGCodec::EncodeBGRASkBitmap(bm, false, &vector)) {
+          return SkData::NewWithCopy(&vector.front(), vector.size());
+        }
       }
     }
     return nullptr;
   }
 };
 
 class SkPictureSerializer {
  public:
   explicit SkPictureSerializer(const base::FilePath& dirpath)
       : dirpath_(dirpath),
@@ skipping 19 matching lines @@
     // Serialize picture to file.
     // TODO(alokp): Note that for this to work Chrome needs to be launched with
     // --no-sandbox command-line flag. Get rid of this limitation.
     // CRBUG: 139640.
     std::string filename = "layer_" + base::IntToString(layer_id_++) + ".skp";
     std::string filepath = dirpath_.AppendASCII(filename).MaybeAsASCII();
     DCHECK(!filepath.empty());
     SkFILEWStream file(filepath.c_str());
     DCHECK(file.isValid());
 
-    PNGSerializer serializer;
+    EncodingSerializer serializer;
     picture->serialize(&file, &serializer);
     file.fsync();
   }
 
  private:
   base::FilePath dirpath_;
   int layer_id_;
 };
 
 template <typename T>
@@ skipping 758 matching lines @@
 bool GpuBenchmarking::HasGpuProcess() {
   bool has_gpu_process = false;
   if (!RenderThreadImpl::current()->Send(
           new GpuHostMsg_HasGpuProcess(&has_gpu_process)))
     return false;
 
   return has_gpu_process;
 }
 
 }  // namespace content