Use the new function signature for EncodeBitmap.

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 21 matching lines @@
 
 namespace {
 
 // Version ID; to be used in serialization.
 const int kPictureVersion = 1;
 
 // Minimum size of a decoded stream that we need.
 // 4 bytes for version, 4 * 4 for each of the 2 rects.
 const unsigned int kMinPictureSizeBytes = 36;
 
-bool EncodeBitmap(SkWStream* stream, const SkBitmap& bm) {
+SkData* EncodeBitmap(size_t* offset, const SkBitmap& bm) {
   const int kJpegQuality = 80;
   std::vector<unsigned char> data;
 
   // If bitmap is opaque, encode as JPEG.
   // Otherwise encode as PNG.
   bool encoding_succeeded = false;
   if (bm.isOpaque()) {
     SkAutoLockPixels lock_bitmap(bm);
     if (bm.empty())
-      return false;
+      return NULL;
 
     encoding_succeeded = gfx::JPEGCodec::Encode(
         reinterpret_cast<unsigned char*>(bm.getAddr32(0, 0)),
         gfx::JPEGCodec::FORMAT_SkBitmap,
         bm.width(),
         bm.height(),
         bm.rowBytes(),
         kJpegQuality,
         &data);
   } else {
     encoding_succeeded = gfx::PNGCodec::EncodeBGRASkBitmap(bm, false, &data);
   }
 
-  if (encoding_succeeded)
-    return stream->write(&data.front(), data.size());
-  return false;
+  if (encoding_succeeded) {
+    *offset = 0;
+    return SkData::NewWithCopy(&data.front(), data.size());
+  }
+  return NULL;
 }
 
 bool DecodeBitmap(const void* buffer, size_t size, SkBitmap* bm) {
   const unsigned char* data = static_cast<const unsigned char *>(buffer);
 
   // Try PNG first.
   if (gfx::PNGCodec::Decode(data, size, bm))
     return true;
 
   // Try JPEG.
@@ skipping 418 matching lines @@
   raster_data->Set("picture_id", TracedValue::CreateIDRef(this).release());
   raster_data->SetDouble("scale", scale);
   raster_data->SetDouble("rect_x", rect.x());
   raster_data->SetDouble("rect_y", rect.y());
   raster_data->SetDouble("rect_width", rect.width());
   raster_data->SetDouble("rect_height", rect.height());
   return TracedValue::FromValue(raster_data.release());
 }
 
 }  // namespace cc