PDF: Now threadsafe!

src/pdf/SkPDFImage.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkPDFImage_DEFINED
@@ skipping 10 matching lines @@
 class SkPDFCatalog;
 struct SkIRect;
 
 /**
  *  Return the mose efficient availible encoding of the given bitmap.
  *
  *  If the bitmap has encoded JPEG data and that data can be embedded
  *  into the PDF output stream directly, use that.  Otherwise, fall
  *  back on SkPDFImage::CreateImage.
  */
-SkPDFObject* SkPDFCreateImageObject(
-        const SkBitmap&, const SkIRect& subset, SkPicture::EncodeBitmap);
+SkPDFObject* SkPDFCreateImageObject(SkPDFCanon* canon,
+                                    const SkBitmap&,
+                                    const SkIRect& subset,
+                                    SkPicture::EncodeBitmap);
 
 /** \class SkPDFImage
 
     An image XObject.
 */
 
 // We could play the same trick here as is done in SkPDFGraphicState, storing
 // a copy of the Bitmap object (not the pixels), the pixel generation number,
 // and settings used from the paint to canonicalize image objects.
 class SkPDFImage : public SkPDFStream {
@@ skipping 46 matching lines @@
     SkPDFImage(SkPDFImage& pdfImage);
 
     // Populate the stream dictionary.  This method returns false if
     // fSubstitute should be used.
     virtual bool populate(SkPDFCatalog* catalog);
 
     typedef SkPDFStream INHERITED;
 };
 
 #endif