Override SkCanvas::drawImage() in SkRecorder.

tests/RecorderTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 
 #include "SkPictureRecorder.h"
 #include "SkRecord.h"
 #include "SkRecorder.h"
 #include "SkRecords.h"
 #include "SkShader.h"
+#include "SkSurface.h"
 
 #define COUNT(T) + 1
 static const int kRecordTypes = SK_RECORD_TYPES(COUNT);
 #undef COUNT
 
 // Tallies the types of commands it sees into a histogram.
 class Tally {
 public:
     Tally() { sk_bzero(&fHistogram, sizeof(fHistogram)); }
 
@@ skipping 118 matching lines @@
                 recorder.restore();
                 REPORTER_ASSERT(r, recorder.isDrawingToLayer());
             recorder.restore();
             REPORTER_ASSERT(r, recorder.isDrawingToLayer());
         recorder.restore();
         REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
     recorder.restore();
     REPORTER_ASSERT(r, !recorder.isDrawingToLayer());
 }
 
+DEF_TEST(Recorder_drawImage_takeReference, reporter) {
+
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(100, 100));
+    surface->getCanvas()->clear(SK_ColorGREEN);
+    SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
+    int beginImageRefCount = image->getRefCnt();

[mtklein, 2014/09/27 15:41:22]

We generally try to avoid calling getRefCnt().  Here in this test it's safe, but
it's a bad habit to get into (because unless it returns 1, it wasn't thread-safe
to call).

I'd prefer it if you can write your test using unique(), if only to use the less
powerful tool when possible:

Maybe like this?

<setup>
REPORTER_ASSERT(r, image->unique());
{
    SkRecord record;
    SkRecorder recorder(&record, ...); 
    recorder.drawImage(image, ...);
    REPORTER_ASSERT(r, !image->unique());  
    Tally tally;
    tally.apply(record);
    REPORTER_ASSERT(r, 1 == tally.count<SkRecords::DrawImage>());
}
REPORTER_ASSERT(r, image->unique());
{
    SkRecord record;
    SkRecorder recorder(&record, ...);
    recorder.drawImageRect(image, ...);
    REPORTER_ASSERT(r, !image->unique());
    Tally tally;
    tally.apply(record);
    REPORTER_ASSERT(r, 1 == tally.count<SkRecords::DrawImageRect>());
}
REPORTER_ASSERT(r, image->unique());

[Rémi Piotaix, 2014/09/29 17:57:55]

Done.

+    {
+        SkRecord record;
+        SkRecorder recorder(&record, 100, 100);
+
+        // DrawImage is supposed to take a reference
+        recorder.drawImage(image.get(), 0, 0);
+        REPORTER_ASSERT(reporter, image->getRefCnt() == beginImageRefCount + 1);
+
+        recorder.drawImageRect(image.get(), 0, SkRect::MakeWH(100, 100));
+        REPORTER_ASSERT(reporter, image->getRefCnt() == beginImageRefCount + 2);
+
+        Tally tally;
+        tally.apply(record);
+
+        REPORTER_ASSERT(reporter, 1 == tally.count<SkRecords::DrawImage>());
+        REPORTER_ASSERT(reporter, 1 == tally.count<SkRecords::DrawImageRect>());
+    }
+    // The SkImage should have the same refCnt as before
+    REPORTER_ASSERT(reporter, image->getRefCnt() == beginImageRefCount);
+}