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<SkImage> image;
+    {
+        SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterPMColor(100, 100));
+        surface->getCanvas()->clear(SK_ColorGREEN);
+        image.reset(surface->newImageSnapshot());
+    }
+    {
+        SkRecord record;
+        SkRecorder recorder(&record, 100, 100);
+
+        // DrawImage is supposed to take a reference
+        recorder.drawImage(image.get(), 0, 0);
+        REPORTER_ASSERT(reporter, !image->unique());
+
+        Tally tally;
+        tally.apply(record);
+
+        REPORTER_ASSERT(reporter, 1 == tally.count<SkRecords::DrawImage>());
+    }
+
+    // The SkImage should be unique

[mtklein, 2014/09/30 14:42:21]

This comment and its friend below say exactly what the next lines of code say. 
You might consider deleting them.

[Rémi Piotaix, 2014/09/30 15:48:09]

Done.

+    REPORTER_ASSERT(reporter, image->unique());
+    {
+        SkRecord record;
+        SkRecorder recorder(&record, 100, 100);
+
+        // DrawImageRect is supposed to take a reference
+        recorder.drawImageRect(image.get(), 0, SkRect::MakeWH(100, 100));
+        REPORTER_ASSERT(reporter, !image->unique());
+
+        Tally tally;
+        tally.apply(record);
+
+        REPORTER_ASSERT(reporter, 1 == tally.count<SkRecords::DrawImageRect>());
+    }
+    // The SkImage should be unique
+    REPORTER_ASSERT(reporter, image->unique());
+}