In SkPDFDocumentToBitmap, use SkCreateDataProviderFromStream

src/utils/mac/SkCreateCGImageRef.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkCGUtils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 170 matching lines @@
     ~SkAutoPDFRelease() {
         if (fDoc) {
             CGPDFDocumentRelease(fDoc);
         }
     }
 private:
     CGPDFDocumentRef fDoc;
 };
 #define SkAutoPDFRelease(...) SK_REQUIRE_LOCAL_VAR(SkAutoPDFRelease)
 
-static void CGDataProviderReleaseData_FromMalloc(void*, const void* data,
-                                                 size_t size) {
-    sk_free((void*)data);
-}
-
 bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) {
-    size_t size = stream->getLength();
-    void* ptr = sk_malloc_throw(size);
-    stream->read(ptr, size);
-    CGDataProviderRef data = CGDataProviderCreateWithData(NULL, ptr, size,
-                                          CGDataProviderReleaseData_FromMalloc);
+    CGDataProviderRef data = SkCreateDataProviderFromStream(stream);
     if (NULL == data) {
         return false;
     }
 
     CGPDFDocumentRef pdf = CGPDFDocumentCreateWithProvider(data);
     CGDataProviderRelease(data);
     if (NULL == pdf) {
         return false;
     }
     SkAutoPDFRelease releaseMe(pdf);
@@ skipping 94 matching lines @@
         default:
             // we don't know if we're opaque or not, so compute it.
             if (SkBitmap::ComputeIsOpaque(tmp)) {
                 tmp.setAlphaType(kOpaque_SkAlphaType);
             }
     }
 
     *dst = tmp;
     return true;
 }