Add tests for SkCanvas::drawImage[Rect]()

tests/CanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*  Description:
  *      This test defines a series of elementatry test steps that perform
  *      a single or a small group of canvas API calls. Each test step is
@@ skipping 99 matching lines @@
     , fIRect(SkIRect::MakeXYWH(0, 0, 2, 1))
     , fRegion(TestRegion())
     , fColor(0x01020304)
     , fPoints(kTestPoints)
     , fPointCount(3)
     , fWidth(2)
     , fHeight(2)
     , fText("Hello World")
     , fPoints2(kTestPoints2)
     , fBitmap(TestBitmap())
+    , fImage(createImage(fColor))
     { }
 
     SkRect fRect;
     SkMatrix fMatrix;;
     SkPath fPath;
     SkPath fNearlyZeroLengthPath;
     SkIRect fIRect;
     SkRegion fRegion;
     SkColor fColor;
     SkPaint fPaint;
     const SkPoint* fPoints;
     size_t fPointCount;
     int fWidth;
     int fHeight;
     SkString fText;
     const SkPoint* fPoints2;
     SkBitmap fBitmap;
+    SkAutoTUnref<const SkImage> fImage;
 
 private:
+    static const SkImage* createImage(SkColor color) {
+        SkAutoTUnref<SkSurface> surface (createSurface(color));
+
+        return surface->newImageSnapshot();
+    }
     static SkMatrix TestMatrix() {
         SkMatrix matrix;
         matrix.reset();
         matrix.setScale(SkIntToScalar(2), SkIntToScalar(3));
 
         return matrix;
     }
     static SkPath TestPath() {
         SkPath path;
         path.addRect(SkRect::MakeXYWH(SkIntToScalar(0), SkIntToScalar(0),
@@ skipping 217 matching lines @@
 SIMPLE_TEST_STEP(DrawText, drawText(d.fText.c_str(), d.fText.size(), 0, 1, d.fPaint));
 SIMPLE_TEST_STEP(DrawPosText, drawPosText(d.fText.c_str(), d.fText.size(), d.fPoints2, d.fPaint));
 SIMPLE_TEST_STEP(DrawTextOnPath, drawTextOnPath(d.fText.c_str(), d.fText.size(),
                                                 d.fPath, NULL, d.fPaint));
 SIMPLE_TEST_STEP(DrawTextOnPathMatrix, drawTextOnPath(d.fText.c_str(), d.fText.size(), d.fPath,
                                                       &d.fMatrix, d.fPaint));
 SIMPLE_TEST_STEP(DrawData, drawData(d.fText.c_str(), d.fText.size()));
 SIMPLE_TEST_STEP(BeginGroup, beginCommentGroup(d.fText.c_str()));
 SIMPLE_TEST_STEP(AddComment, addComment(d.fText.c_str(), d.fText.c_str()));
 SIMPLE_TEST_STEP(EndGroup, endCommentGroup());
+SIMPLE_TEST_STEP(DrawImage, drawImage(d.fImage, 0, 0));
+SIMPLE_TEST_STEP(DrawImageRect, drawImageRect(d.fImage, 0, d.fRect));
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // Complex test steps
 
 static void SaveMatrixClipStep(SkCanvas* canvas, const TestData& d,
                                skiatest::Reporter* reporter, CanvasTestStep* testStep) {
     int saveCount = canvas->getSaveCount();
     canvas->save();
     canvas->translate(SkIntToScalar(1), SkIntToScalar(2));
     canvas->clipRegion(d.fRegion);
@@ skipping 482 matching lines @@
 
     for (int testStep = 0; testStep < testStepArray().count(); testStep++) {
         TestOverrideStateConsistency(reporter, d, testStepArray()[testStep]);
         if (testStepArray()[testStep]->enablePdfTesting()) {
             TestPdfDevice(reporter, d, testStepArray()[testStep]);
         }
     }
 
     test_newraster(reporter);
 }