Make xfermodes3 GM also test stroked rects

gm/xfermodes3.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gm.h"
 #include "SkBitmap.h"
 #include "SkGradientShader.h"
@@ skipping 14 matching lines @@
 class Xfermodes3GM : public GM {
 public:
     Xfermodes3GM() {}
 
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("xfermodes3");
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
-        return make_isize(630, 620);
+        return make_isize(630, 1215);
     }
 
     virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint bgPaint;
         bgPaint.setColor(0xFF70D0E0);
         canvas->drawPaint(bgPaint);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         canvas->translate(SkIntToScalar(10), SkIntToScalar(20));
 
         SkPaint labelP;
         labelP.setAntiAlias(true);
 
         static const SkColor kSolidColors[] = {
             SK_ColorTRANSPARENT,
             SK_ColorBLUE,
             0x80808000
         };
 
         static const SkColor kBmpAlphas[] = {
             0xff,
             0x80,
         };
 
         SkAutoTUnref<SkCanvas> tempCanvas(this->possiblyCreateTempCanvas(canvas, kSize, kSize));
 
         int test = 0;
         int x = 0, y = 0;
-        for (size_t m = 0; m <= SkXfermode::kLastMode; ++m) {
-            SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(m);
-            canvas->drawText(SkXfermode::ModeName(mode),
-                             strlen(SkXfermode::ModeName(mode)),
-                             SkIntToScalar(x),
-                             SkIntToScalar(y + kSize + 3) + labelP.getTextSize(),
-                             labelP);
-            for (size_t c = 0; c < SK_ARRAY_COUNT(kSolidColors); ++c) {
-                SkPaint modePaint;
-                modePaint.setXfermodeMode(mode);
-                modePaint.setColor(kSolidColors[c]);
+        static const struct { SkPaint::Style fStyle; SkScalar fWidth; } kStrokes[] = {
+            {SkPaint::kFill_Style, 0},
+            {SkPaint::kStroke_Style, SkIntToScalar(kSize) / 2},
+        };
+        for (size_t s = 0; s < SK_ARRAY_COUNT(kStrokes); ++s) {
+            for (size_t m = 0; m <= SkXfermode::kLastMode; ++m) {
+                SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(m);
+                canvas->drawText(SkXfermode::ModeName(mode),
+                                 strlen(SkXfermode::ModeName(mode)),
+                                 SkIntToScalar(x),
+                                 SkIntToScalar(y + kSize + 3) + labelP.getTextSize(),
+                                 labelP);
+                for (size_t c = 0; c < SK_ARRAY_COUNT(kSolidColors); ++c) {
+                    SkPaint modePaint;
+                    modePaint.setXfermodeMode(mode);
+                    modePaint.setColor(kSolidColors[c]);
+                    modePaint.setStyle(kStrokes[s].fStyle);
+                    modePaint.setStrokeWidth(kStrokes[s].fWidth);
 
-                this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempCanvas.get());
+                    this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempCanvas.get());
 
-                ++test;
-                x += kSize + 10;
-                if (!(test % kTestsPerRow)) {
-                    x = 0;
-                    y += kSize + 30;
+                    ++test;
+                    x += kSize + 10;
+                    if (!(test % kTestsPerRow)) {
+                        x = 0;
+                        y += kSize + 30;
+                    }
                 }
-            }
-            for (size_t a = 0; a < SK_ARRAY_COUNT(kBmpAlphas); ++a) {
-                SkPaint modePaint;
-                modePaint.setXfermodeMode(mode);
-                modePaint.setAlpha(kBmpAlphas[a]);
-                modePaint.setShader(fBmpShader);
+                for (size_t a = 0; a < SK_ARRAY_COUNT(kBmpAlphas); ++a) {
+                    SkPaint modePaint;
+                    modePaint.setXfermodeMode(mode);
+                    modePaint.setAlpha(kBmpAlphas[a]);
+                    modePaint.setShader(fBmpShader);
+                    modePaint.setStyle(kStrokes[s].fStyle);
+                    modePaint.setStrokeWidth(kStrokes[s].fWidth);
 
-                this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempCanvas.get());
+                    this->drawMode(canvas, x, y, kSize, kSize, modePaint, tempCanvas.get());
 
-                ++test;
-                x += kSize + 10;
-                if (!(test % kTestsPerRow)) {
-                    x = 0;
-                    y += kSize + 30;
+                    ++test;
+                    x += kSize + 10;
+                    if (!(test % kTestsPerRow)) {
+                        x = 0;
+                        y += kSize + 30;
+                    }
                 }
             }
         }
     }
 
 private:
     /**
      * GrContext has optimizations around full rendertarget draws that can be replaced with clears.
      * We are trying to test those. We could use saveLayer() to create small SkGpuDevices but
      * saveLayer() uses the texture cache. This means that the actual render target may be larger
@@ skipping 118 matching lines @@
     SkAutoTUnref<SkShader> fBmpShader;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new Xfermodes3GM;)
 
 }