commit 5ae5fc59b27a48711e514b3ede548b228e393e9b
author joshualitt <joshualitt@chromium.org> Tue Jul 29 12:59:27 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 29 12:59:27 2014 -0700
tree 94f6fe685a1bfcc9e15704cda869c67b97f057d3
parent 937fca81067d31bb74fc299469b2406a12064436

Adding repeat mode to texture domain

BUG=skia:
R=bsalomon@chromium.org, senorblanco@chromium.org, bsalomon@google.com, junov@chromium.org

Author: joshualitt@chromium.org

Review URL: https://codereview.chromium.org/422123003

gm/texturedomaineffect.cpp

diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 37d256d..6cc9799 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -35,7 +35,10 @@
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
-        return SkISize::Make(400, 800);
+        const SkScalar canvasWidth = kDrawPad +
+                (kTargetWidth + 2 * kDrawPad) * GrTextureDomain::kModeCount +
+                kTestPad * GrTextureDomain::kModeCount;
+        return SkISize::Make(SkScalarCeilToInt(canvasWidth), 800);
     }
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
@@ -44,7 +47,7 @@
     }
 
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
-        fBmp.allocN32Pixels(100, 100);
+        fBmp.allocN32Pixels(kTargetWidth, kTargetHeight);
         SkCanvas canvas(fBmp);
         canvas.clear(0x00000000);
         SkPaint paint;
@@ -94,9 +97,6 @@
             return;
         }
 
-        static const SkScalar kDrawPad = 10.f;
-        static const SkScalar kTestPad = 10.f;
-
         SkTArray<SkMatrix> textureMatrices;
         textureMatrices.push_back().setIDiv(texture->width(), texture->height());
         textureMatrices.push_back() = textureMatrices[0];
@@ -148,11 +148,19 @@
     }
 
 private:
+    static const SkScalar kDrawPad;
+    static const SkScalar kTestPad;
+    static const int      kTargetWidth = 100;
+    static const int      kTargetHeight = 100;
     SkBitmap fBmp;
 
     typedef GM INHERITED;
 };
 
+// Windows builds did not like SkScalar initialization in class :(
+const SkScalar TextureDomainEffect::kDrawPad = 10.f;
+const SkScalar TextureDomainEffect::kTestPad = 10.f;
+
 DEF_GM( return SkNEW(TextureDomainEffect); )
 }