Index: gm/texturedomaineffect.cpp |
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp |
index ba574b6b09be798961d5b0660f0c3a716388ba04..2dd340e4252dac9c86f8169f744d271eb3a6b670 100644 |
--- a/gm/texturedomaineffect.cpp |
+++ b/gm/texturedomaineffect.cpp |
@@ -138,19 +138,15 @@ protected: |
} |
private: |
- static const SkScalar kDrawPad; |
- static const SkScalar kTestPad; |
- static const int kTargetWidth = 100; |
- static const int kTargetHeight = 100; |
+ static constexpr SkScalar kDrawPad = 10.f; |
+ static constexpr SkScalar kTestPad = 10.f;; |
+ static constexpr int kTargetWidth = 100; |
+ static constexpr 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 new TextureDomainEffect;) |
} |