Revert of Revert of Revert of Make drawImage a virtual on SkDevice

src/pipe/SkGPipeWrite.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 "SkAnnotation.h"
 #include "SkBitmapDevice.h"
@@ skipping 254 matching lines @@
                      const SkPaint& paint) override;
     void onDrawPaint(const SkPaint&) override;
     void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override;
     void onDrawRect(const SkRect&, const SkPaint&) override;
     void onDrawOval(const SkRect&, const SkPaint&) override;
     void onDrawRRect(const SkRRect&, const SkPaint&) override;
     void onDrawPath(const SkPath&, const SkPaint&) override;
     void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override;
     void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*,
                           DrawBitmapRectFlags flags) override;
+#if 0
+    // rely on decomposition into bitmap (for now)
     void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override;
     void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
                          const SkPaint*) override;
+#endif
     void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst,
                           const SkPaint*) override;
     void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override;
     void onDrawVertices(VertexMode vmode, int vertexCount,
                         const SkPoint vertices[], const SkPoint texs[],
                         const SkColor colors[], SkXfermode* xmode,
                         const uint16_t indices[], int indexCount,
                         const SkPaint&) override;
     void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipRegion(const SkRegion&, SkRegion::Op) override;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
 
 private:
     void recordTranslate(const SkMatrix&);
     void recordScale(const SkMatrix&);
     void recordConcat(const SkMatrix&);
 
     SkNamedFactorySet* fFactorySet;
     SkBitmapHeap*      fBitmapHeap;
-    SkImageHeap*       fImageHeap;
     SkGPipeController* fController;
     SkWriter32&        fWriter;
     size_t             fBlockSize; // amount allocated for writer
     size_t             fBytesNotified;
     bool               fDone;
     const uint32_t     fFlags;
 
     SkRefCntSet        fTypefaceSet;
 
     uint32_t getTypefaceID(SkTypeface*);
@@ skipping 28 matching lines @@
 
     FlattenableHeap             fFlattenableHeap;
     FlatDictionary              fFlatDictionary;
     SkAutoTUnref<BitmapShuttle> fBitmapShuttle;
     int                         fCurrFlatIndex[kCount_PaintFlats];
 
     int flattenToIndex(SkFlattenable* obj, PaintFlats);
 
     // Common code used by drawBitmap*. Behaves differently depending on the
     // type of SkBitmapHeap being used, which is determined by the flags used.
-    bool commonDrawBitmap(const SkBitmap&, DrawOps, unsigned flags, size_t bytes, const SkPaint*);
-    bool commonDrawImage(const SkImage*, DrawOps, unsigned flags, size_t bytes, const SkPaint*);
+    bool commonDrawBitmap(const SkBitmap& bm, DrawOps op, unsigned flags,
+                          size_t opBytesNeeded, const SkPaint* paint);
 
     SkPaint fPaint;
     void writePaint(const SkPaint&);
 
     class AutoPipeNotify {
     public:
         AutoPipeNotify(SkGPipeCanvas* canvas) : fCanvas(canvas) {}
         ~AutoPipeNotify() { fCanvas->doNotify(); }
     private:
         SkGPipeCanvas* fCanvas;
@@ skipping 92 matching lines @@
         fBitmapHeap = SkNEW_ARGS(SkBitmapHeap, (fBitmapShuttle.get(), BITMAPS_TO_KEEP));
     } else {
         fBitmapHeap = SkNEW_ARGS(SkBitmapHeap,
                                  (BITMAPS_TO_KEEP, controller->numberOfReaders()));
         if (this->needOpBytes(sizeof(void*))) {
             this->writeOp(kShareBitmapHeap_DrawOp);
             fWriter.writePtr(static_cast<void*>(fBitmapHeap));
         }
     }
     fFlattenableHeap.setBitmapStorage(fBitmapHeap);
-
-    fImageHeap = SkNEW(SkImageHeap);
-    if (this->needOpBytes(sizeof(void*))) {
-        this->writeOp(kShareImageHeap_DrawOp);
-        fWriter.writePtr(static_cast<void*>(fImageHeap));
-    }
-
     this->doNotify();
 }
 
 SkGPipeCanvas::~SkGPipeCanvas() {
     this->finish(true);
     SkSafeUnref(fFactorySet);
     SkSafeUnref(fBitmapHeap);
-    SkSafeUnref(fImageHeap);
 }
 
 bool SkGPipeCanvas::needOpBytes(size_t needed) {
     if (fDone) {
         return false;
     }
 
     needed += 4;  // size of DrawOp atom
     needed = SkAlign4(needed);
     if (fWriter.bytesWritten() + needed > fBlockSize) {
@@ skipping 334 matching lines @@
 void SkGPipeCanvas::onDrawSprite(const SkBitmap& bm, int left, int top, const SkPaint* paint) {
     NOTIFY_SETUP(this);
     size_t opBytesNeeded = sizeof(int32_t) * 2;
 
     if (this->commonDrawBitmap(bm, kDrawSprite_DrawOp, 0, opBytesNeeded, paint)) {
         fWriter.write32(left);
         fWriter.write32(top);
     }
 }
 
-bool SkGPipeCanvas::commonDrawImage(const SkImage* image, DrawOps op, unsigned flags,
-                                    size_t opBytesNeeded, const SkPaint* paint) {
-    if (fDone) {
-        return false;
-    }
-    
-    if (paint != NULL) {
-        flags |= kDrawBitmap_HasPaint_DrawOpFlag;
-        this->writePaint(*paint);
-    }
-    // This needs to run first so its calls to needOpBytes() and its writes
-    // don't interlace with the needOpBytes() and write below.
-    int32_t slot = fImageHeap->insert(image);
-    SkASSERT(slot != 0);
-    if (this->needOpBytes(opBytesNeeded)) {
-        this->writeOp(op, flags, slot);
-        return true;
-    }
-    return false;
-}
-
-void SkGPipeCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y,
-                                const SkPaint* paint) {
-    NOTIFY_SETUP(this);
-    if (this->commonDrawImage(image, kDrawImage_DrawOp, 0, sizeof(SkScalar) * 2, paint)) {
-        fWriter.writeScalar(x);
-        fWriter.writeScalar(y);
-    }
-}
-
-void SkGPipeCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                                    const SkPaint* paint) {
-    NOTIFY_SETUP(this);
-    unsigned flags = 0;
-    size_t opBytesNeeded = sizeof(SkRect);  // dst
-    if (src) {
-        flags |= kDrawBitmap_HasSrcRect_DrawOpFlag;
-        opBytesNeeded += sizeof(SkRect);    // src
-    }
-    if (this->commonDrawImage(image, kDrawImageRect_DrawOp, flags, opBytesNeeded, paint)) {
-        if (src) {
-            fWriter.writeRect(*src);
-        }
-        fWriter.writeRect(dst);
-    }
-}
-
 void SkGPipeCanvas::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                                const SkPaint& paint) {
     if (byteLength) {
         NOTIFY_SETUP(this);
         this->writePaint(paint);
         if (this->needOpBytes(4 + SkAlign4(byteLength) + 2 * sizeof(SkScalar))) {
             this->writeOp(kDrawText_DrawOp);
             fWriter.write32(SkToU32(byteLength));
             fWriter.writePad(text, byteLength);
             fWriter.writeScalar(x);
@@ skipping 494 matching lines @@
     return fCanvas->shuttleBitmap(bitmap, slot);
 }
 
 void BitmapShuttle::removeCanvas() {
     if (NULL == fCanvas) {
         return;
     }
     fCanvas->unref();
     fCanvas = NULL;
 }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-SkImageHeap::SkImageHeap() {}
-
-SkImageHeap::~SkImageHeap() {
-    fArray.unrefAll();
-}
-
-const SkImage* SkImageHeap::get(int32_t slot) const {
-    SkASSERT(slot > 0);
-    return fArray[slot - 1];
-}
-
-int32_t SkImageHeap::find(const SkImage* img) const {
-    int index = fArray.find(img);
-    if (index >= 0) {
-        return index + 1;   // found
-    }
-    return 0;   // not found
-}
-
-int32_t SkImageHeap::insert(const SkImage* img) {
-    int32_t slot = this->find(img);
-    if (slot) {
-        return slot;
-    }
-    *fArray.append() = SkRef(img);
-    return fArray.count();  // slot is always index+1
-}
-