Make filters use SkImage instead of SkBitmap

src/pdf/SkPDFDevice.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 "SkPDFDevice.h"
 
 #include "SkAnnotation.h"
 #include "SkBitmapDevice.h"
+#include "SkClipStack.h"
 #include "SkColor.h"
-#include "SkClipStack.h"
 #include "SkData.h"
 #include "SkDraw.h"
 #include "SkGlyphCache.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPathOps.h"
+#include "SkImage_Base.h"
 #include "SkPDFFont.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
 #include "SkPDFImage.h"
 #include "SkPDFResourceDict.h"
 #include "SkPDFShader.h"
 #include "SkPDFStream.h"
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
+#include "SkPaint.h"
+#include "SkPath.h"
+#include "SkPathOps.h"
+#include "SkRRect.h"
 #include "SkRect.h"
-#include "SkRRect.h"
 #include "SkString.h"
 #include "SkSurface.h"
+#include "SkTSet.h"
+#include "SkTemplates.h"
 #include "SkTextFormatParams.h"
-#include "SkTemplates.h"
 #include "SkTypefacePriv.h"
-#include "SkTSet.h"
 
 #define DPI_FOR_RASTER_SCALE_ONE 72
 
 // Utility functions
 
 static void emit_pdf_color(SkColor color, SkWStream* result) {
     SkASSERT(SkColorGetA(color) == 0xFF);  // We handle alpha elsewhere.
     SkScalar colorMax = SkIntToScalar(0xFF);
     SkPDFScalar::Append(
             SkScalarDiv(SkIntToScalar(SkColorGetR(color)), colorMax), result);
@@ skipping 995 matching lines @@
     if (d.fClip->isEmpty()) {
         return;
     }
 
     SkMatrix matrix;
     matrix.setTranslate(SkIntToScalar(x), SkIntToScalar(y));
     this->internalDrawBitmap(matrix, d.fClipStack, *d.fClip, bitmap, NULL,
                              paint);
 }
 
+void SkPDFDevice::drawSprite(const SkDraw& draw, const SkImage& image, int x, int y,
+                             const SkPaint& paint) {
+    SkBitmap bitmap;
+    if (!as_IB(&image)->getROPixels(&bitmap)) {
+        return;
+    }
+    this->drawSprite(draw, bitmap, x, y, paint);
+}
+
 void SkPDFDevice::drawText(const SkDraw& d, const void* text, size_t len,
                            SkScalar x, SkScalar y, const SkPaint& paint) {
     NOT_IMPLEMENTED(paint.getMaskFilter() != NULL, false);
     if (paint.getMaskFilter() != NULL) {
         // Don't pretend we support drawing MaskFilters, it makes for artifacts
         // making text unreadable (e.g. same text twice when using CSS shadows).
         return;
     }
     SkPaint textPaint = calculate_text_paint(paint);
     ScopedContentEntry content(this, d, textPaint, true);
@@ skipping 1068 matching lines @@
 
     SkAutoTUnref<SkPDFObject> image(
             SkPDFCreateImageObject(fCanon, *bitmap, subset));
     if (!image) {
         return;
     }
 
     SkPDFUtils::DrawFormXObject(this->addXObjectResource(image.get()),
                                 &content.entry()->fContent);
 }