Use SkPicture::ExtractBitmap callback in pdf too.

tests/PDFPrimitivesTest.cpp

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkBitmap.h"
@@ skipping 21 matching lines @@
     }
 
     void addResource(SkPDFObject* object) {
         fResources.append(1, &object);
     }
 
 private:
     SkTDArray<SkPDFObject*> fResources;
 };
 
-static bool encode_to_dct_stream(SkWStream* stream, const SkBitmap& bitmap, const SkIRect& rect) {
-    stream->writeText("DCT compessed stream.");
-    return true;
+#define DUMMY_TEXT "DCT compessed stream."
+
+static SkData* encode_to_dct_data(size_t* pixelRefOffset, const SkBitmap& bitmap) {
+    *pixelRefOffset = 0;
+    return SkData::NewWithProc(DUMMY_TEXT, sizeof(DUMMY_TEXT) - 1, NULL, NULL);
 }
 
 static bool stream_equals(const SkDynamicMemoryWStream& stream, size_t offset,
                           const void* buffer, size_t len) {
     SkAutoDataUnref data(stream.copyToData());
     if (offset + len > data->size()) {
         return false;
     }
     return memcmp(data->bytes() + offset, buffer, len) == 0;
 }
@@ skipping 191 matching lines @@
     bitmap->allocPixels();
     bitmap->eraseColor(SK_ColorWHITE);
 }
 
 static void TestImage(skiatest::Reporter* reporter, const SkBitmap& bitmap,
                       const char* expected, bool useDCTEncoder) {
     SkISize pageSize = SkISize::Make(bitmap.width(), bitmap.height());
     SkAutoTUnref<SkPDFDevice> dev(new SkPDFDevice(pageSize, pageSize, SkMatrix::I()));
 
     if (useDCTEncoder) {
-        dev->setDCTEncoder(encode_to_dct_stream);
+        dev->setDCTEncoder(encode_to_dct_data);
     }
 
     SkCanvas c(dev);
     c.drawBitmap(bitmap, 0, 0, NULL);
 
     SkPDFDocument doc;
     doc.appendPage(dev);
 
     SkDynamicMemoryWStream stream;
     doc.emitPDF(&stream);
@@ skipping 159 matching lines @@
 
     TestSubstitute(reporter);
 
     test_issue1083();
 
     TestImages(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("PDFPrimitives", PDFPrimitivesTestClass, TestPDFPrimitives)