New API for encoding bitmaps during serialization.

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
@@ skipping 341 matching lines @@
         fData->ref();
         return fData;
     }
 
 private:
     SkData* fData;
 };
 
 #include "SkImageEncoder.h"
 
-static bool PNGEncodeBitmapToStream(SkWStream* wStream, const SkBitmap& bm) {
-    return SkImageEncoder::EncodeStream(wStream, bm, SkImageEncoder::kPNG_Type, 100);
+static SkData* encode_bitmap_to_data(size_t* offset, const SkBitmap& bm) {
+    *offset = 0;
+    return SkImageEncoder::EncodeData(bm, SkImageEncoder::kPNG_Type, 100);
 }
 
 static SkData* serialized_picture_from_bitmap(const SkBitmap& bitmap) {
     SkPicture picture;
     SkCanvas* canvas = picture.beginRecording(bitmap.width(), bitmap.height());
     canvas->drawBitmap(bitmap, 0, 0);
     SkDynamicMemoryWStream wStream;
-    picture.serialize(&wStream, &PNGEncodeBitmapToStream);
+    picture.serialize(&wStream, &encode_bitmap_to_data);
     return wStream.copyToData();
 }
 
 struct ErrorContext {
     int fErrors;
     skiatest::Reporter* fReporter;
 };
 
 static void assert_one_parse_error_cb(SkError error, void* context) {
     ErrorContext* errorContext = static_cast<ErrorContext*>(context);
@@ skipping 175 matching lines @@
 #endif
     test_peephole();
     test_gatherpixelrefs(reporter);
     test_bitmap_with_encoded_data(reporter);
     test_clone_empty(reporter);
     test_clip_bound_opt(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Pictures", PictureTestClass, TestPicture)