Ignore offset parameter in encode callback. It is ignored/deprecated by the caller, and bitmap.pixe…

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"
@@ skipping 28 matching lines @@
 using blink::WebCanvas;
 using blink::WebFrame;
 using blink::WebImageCache;
 using blink::WebPrivatePtr;
 using blink::WebRenderingStatsImpl;
 using blink::WebSize;
 using blink::WebView;
 
 const char kGpuBenchmarkingExtensionName[] = "v8/GpuBenchmarking";
 
+// offset parameter is deprecated/ignored, and will be remove from the
+// signature in a future skia release.

[jamesr, 2014/01/07 21:23:16]

could you add a TODO with a link to a bug tracking this removal, or if there
isn't a bug the email of whoever's driving the removal?

[reed1, 2014/01/07 21:28:31]

Done.

 static SkData* EncodeBitmapToData(size_t* offset, const SkBitmap& bm) {
     SkPixelRef* pr = bm.pixelRef();
     if (pr != NULL) {
         SkData* data = pr->refEncodedData();
         if (data != NULL) {

[jamesr, 2014/01/07 21:23:16]

remove the { }s as well since this is now a one-liner

[reed1, 2014/01/07 21:28:31]

Done.

-            *offset = bm.pixelRefOffset();
             return data;
         }
     }
     std::vector<unsigned char> vector;
     if (gfx::PNGCodec::EncodeBGRASkBitmap(bm, false, &vector)) {
         return SkData::NewWithCopy(&vector.front() , vector.size());
     }
     return NULL;
 }
 
@@ skipping 780 matching lines @@
     GpuChannelHost* gpu_channel = RenderThreadImpl::current()->GetGpuChannel();
     args.GetReturnValue().Set(!!gpu_channel);
   }
 };
 
 v8::Extension* GpuBenchmarkingExtension::Get() {
   return new GpuBenchmarkingWrapper();
 }
 
 }  // namespace content