Use the new function signature for EncodeBitmap.

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 <string>
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "content/common/gpu/gpu_rendering_stats.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/all_rendering_benchmarks.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/rendering_benchmark.h"
 #include "content/renderer/skia_benchmarking_extension.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewBenchmarkSupport.h"
+#include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "v8/include/v8.h"
 #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebFrame;
 using WebKit::WebPrivatePtr;
 using WebKit::WebRenderingStatsImpl;
 using WebKit::WebSize;
 using WebKit::WebView;
 using WebKit::WebViewBenchmarkSupport;
 
 const char kGpuBenchmarkingExtensionName[] = "v8/GpuBenchmarking";
 
-static bool PNGEncodeBitmapToStream(SkWStream* stream, const SkBitmap& bm) {
+static SkData* EncodeBitmapToData(size_t* offset, const SkBitmap& bm) {
+    SkPixelRef* pr = bm.pixelRef();

[vmpstr, 2013/05/21 18:48:27]

I was under the impression that SkOrderedWriteBuffer::writeBitmap already did
this check, and the encoder would only be called if refEncodedData returned
null. Is that not the case anymore?

I'm just trying to understand the difference between this EncodeBitmap and the
one in picture.cc

[scroggo, 2013/05/21 18:58:36]

You are correct; writeBitmap DID do that check, but
https://codereview.chromium.org/15489004/ removes the check.

If we do the check in picture.cc, that encoded picture will contain the original
encoded data (when refEncodedData returns non-NULL). This has a couple of
downsides (which could be fixed):

1. Some bitmaps cannot be decoded by DecodeBitmap, so the result will be a red
bitmap.
 - This could be fixed by adding more decoders.
 - It could also be fixed by checking to see if the result of refEncodedData can
be decoded, and if not, re-encoding to a format that can be decoded.
2. Although the original encoded data means the result will be exactly like the
original, it won't perform the same lazy decoding (although maybe that's okay).

Should I add the check for refEncodedData in picture.cc?

+    if (pr != NULL) {
+        SkData* data = pr->refEncodedData();
+        if (data != NULL) {
+            *offset = bm.pixelRefOffset();
+            return data;
+        }
+    }
     std::vector<unsigned char> vector;
     if (gfx::PNGCodec::EncodeBGRASkBitmap(bm, true, &vector)) {
-        if (stream->write(&vector.front() , vector.size()))
-            return true;
+        return SkData::NewWithCopy(&vector.front() , vector.size());
     }
-    return false;
+    return NULL;
 }
 
 namespace {
 
 class SkPictureRecorder : public WebViewBenchmarkSupport::PaintClient {
  public:
   explicit SkPictureRecorder(const base::FilePath& dirpath)
       : dirpath_(dirpath),
         layer_id_(0) {
     // Let skia register known effect subclasses. This basically enables
@@ skipping 10 matching lines @@
     picture_.endRecording();
     // 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());
-    picture_.serialize(&file, &PNGEncodeBitmapToStream);
+    picture_.serialize(&file, &EncodeBitmapToData);
   }
 
  private:
   base::FilePath dirpath_;
   int layer_id_;
   SkPicture picture_;
 };
 
 class RenderingStatsEnumerator : public cc::RenderingStats::Enumerator {
  public:
@@ skipping 416 matching lines @@
 
     return v8::Undefined();
   }
 };
 
 v8::Extension* GpuBenchmarkingExtension::Get() {
   return new GpuBenchmarkingWrapper();
 }
 
 }  // namespace content