PDF: Now threadsafe!

src/pdf/SkPDFImage.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 "SkPDFImage.h"
 
 #include "SkBitmap.h"
@@ skipping 699 matching lines @@
     // 0   1   2   3   4   5   6   7   8   9   10
     // FF  D8  FF  E0  ??  ??  'J' 'F' 'I' 'F' 00 ...
     return ((0 == memcmp(data->bytes(), bytesZeroToThree,
                          sizeof(bytesZeroToThree)))
             && (0 == memcmp(data->bytes() + 6, bytesSixToTen,
                             sizeof(bytesSixToTen))));
 }
 }  // namespace
 #endif
 
-SkPDFObject* SkPDFCreateImageObject(
-        const SkBitmap& bitmap,
-        const SkIRect& subset,
-        SkPicture::EncodeBitmap encoder) {
-    if (SkPDFObject* pdfBitmap = SkPDFBitmap::Create(bitmap, subset)) {
+SkPDFObject* SkPDFCreateImageObject(SkPDFCanon* canon,
+                                    const SkBitmap& bitmap,
+                                    const SkIRect& subset,
+                                    SkPicture::EncodeBitmap encoder) {
+    if (SkPDFObject* pdfBitmap = SkPDFBitmap::Create(canon, bitmap, subset)) {
         return pdfBitmap;
     }
 #if 0  // reenable when we can figure out the JPEG colorspace
     if (SkIRect::MakeWH(bitmap.width(), bitmap.height()) == subset) {
         SkAutoTUnref<SkData> encodedData(ref_encoded_data(bitmap));
         if (is_jfif_jpeg(encodedData)) {
             return SkNEW_ARGS(PDFJPEGImage,
                               (encodedData, bitmap.width(), bitmap.height()));
         }
     }
 #endif
     return SkPDFImage::CreateImage(bitmap, subset, encoder);
 }