aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gm/aarectmodes.cpp2
-rw-r--r--gm/androidfallback.cpp2
-rw-r--r--gm/arcofzorro.cpp2
-rw-r--r--gm/beziereffects.cpp6
-rw-r--r--gm/bicubicfilter.cpp2
-rw-r--r--gm/bigblurs.cpp2
-rw-r--r--gm/bigmatrix.cpp2
-rw-r--r--gm/bitmapcopy.cpp2
-rw-r--r--gm/bitmapfilters.cpp2
-rw-r--r--gm/bitmapmatrix.cpp2
-rw-r--r--gm/bitmapscroll.cpp2
-rw-r--r--gm/blurs.cpp2
-rw-r--r--gm/circles.cpp2
-rw-r--r--gm/cmykjpeg.cpp2
-rw-r--r--gm/coloremoji.cpp2
-rw-r--r--gm/colormatrix.cpp2
-rw-r--r--gm/complexclip.cpp2
-rw-r--r--gm/complexclip2.cpp4
-rw-r--r--gm/convexpaths.cpp2
-rw-r--r--gm/convexpolyclip.cpp2
-rw-r--r--gm/convexpolyeffect.cpp2
-rw-r--r--gm/copyTo4444.cpp2
-rw-r--r--gm/dashing.cpp8
-rw-r--r--gm/degeneratesegments.cpp2
-rw-r--r--gm/deviceproperties.cpp2
-rw-r--r--gm/displacement.cpp2
-rw-r--r--gm/distantclip.cpp2
-rw-r--r--gm/drawbitmaprect.cpp2
-rw-r--r--gm/emptypath.cpp2
-rw-r--r--gm/etc1bitmap.cpp4
-rw-r--r--gm/extractbitmap.cpp2
-rw-r--r--gm/factory.cpp2
-rw-r--r--gm/filltypes.cpp2
-rw-r--r--gm/filltypespersp.cpp2
-rw-r--r--gm/fontscaler.cpp2
-rw-r--r--gm/gammatext.cpp2
-rw-r--r--gm/getpostextpath.cpp2
-rw-r--r--gm/gm.h6
-rw-r--r--gm/gradientDirtyLaundry.cpp2
-rw-r--r--gm/gradients_no_texture.cpp2
-rw-r--r--gm/gradtext.cpp6
-rw-r--r--gm/hairlines.cpp2
-rw-r--r--gm/hairmodes.cpp2
-rw-r--r--gm/imagealphathreshold.cpp2
-rw-r--r--gm/imageblur.cpp2
-rw-r--r--gm/imageblurtiled.cpp2
-rw-r--r--gm/imagefiltersclipped.cpp2
-rw-r--r--gm/imagefiltersscaled.cpp2
-rw-r--r--gm/imagemagnifier.cpp2
-rw-r--r--gm/imageresizetiled.cpp2
-rw-r--r--gm/internal_links.cpp2
-rw-r--r--gm/inversepaths.cpp2
-rw-r--r--gm/lcdtext.cpp2
-rw-r--r--gm/linepaths.cpp4
-rw-r--r--gm/matrixconvolution.cpp2
-rw-r--r--gm/matriximagefilter.cpp2
-rw-r--r--gm/mixedxfermodes.cpp2
-rw-r--r--gm/modecolorfilters.cpp2
-rw-r--r--gm/morphology.cpp2
-rw-r--r--gm/nested.cpp2
-rw-r--r--gm/ninepatchstretch.cpp2
-rw-r--r--gm/offsetimagefilter.cpp2
-rwxr-xr-xgm/ovals.cpp2
-rw-r--r--gm/patheffects.cpp2
-rw-r--r--gm/pathopsinverse.cpp2
-rw-r--r--gm/pathopsskpclip.cpp2
-rw-r--r--gm/pathreverse.cpp2
-rw-r--r--gm/points.cpp2
-rw-r--r--gm/quadpaths.cpp4
-rw-r--r--gm/rects.cpp2
-rw-r--r--gm/resizeimagefilter.cpp2
-rw-r--r--gm/roundrects.cpp2
-rw-r--r--gm/rrects.cpp2
-rw-r--r--gm/samplerstress.cpp2
-rw-r--r--gm/selftest.cpp2
-rw-r--r--gm/shaderbounds.cpp2
-rw-r--r--gm/shadertext.cpp2
-rw-r--r--gm/shadertext2.cpp2
-rw-r--r--gm/shadertext3.cpp2
-rw-r--r--gm/shadows.cpp2
-rw-r--r--gm/simpleaaclip.cpp2
-rw-r--r--gm/skbug1719.cpp2
-rw-r--r--gm/strokefill.cpp2
-rw-r--r--gm/strokerects.cpp2
-rw-r--r--gm/texdata.cpp2
-rw-r--r--gm/texturedomaineffect.cpp2
-rw-r--r--gm/thinrects.cpp2
-rw-r--r--gm/thinstrokedrects.cpp2
-rw-r--r--gm/tileimagefilter.cpp2
-rw-r--r--gm/tinybitmap.cpp2
-rw-r--r--gm/twopointradial.cpp2
-rw-r--r--gm/verttext.cpp2
-rw-r--r--gm/verttext2.cpp2
-rw-r--r--gm/xfermodeimagefilter.cpp2
-rw-r--r--gm/xfermodes.cpp2
-rw-r--r--gm/xfermodes2.cpp2
-rw-r--r--gm/xfermodes3.cpp2
97 files changed, 107 insertions, 113 deletions
diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp
index ee0bacee2e..b2a28c1d52 100644
--- a/gm/aarectmodes.cpp
+++ b/gm/aarectmodes.cpp
@@ -141,7 +141,7 @@ namespace skiagm {
return SkString("aarectmodes");
}
- virtual SkISize onISize() { return make_isize(640, 480); }
+ virtual SkISize onISize() { return SkISize::Make(640, 480); }
virtual void onDraw(SkCanvas* canvas) {
if (false) { // avoid bit rot, suppress warning
diff --git a/gm/androidfallback.cpp b/gm/androidfallback.cpp
index e3d7dd3953..e0f36aae9e 100644
--- a/gm/androidfallback.cpp
+++ b/gm/androidfallback.cpp
@@ -26,7 +26,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(500, 500);
+ return SkISize::Make(500, 500);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp
index d78c76c590..2e5dff8e7e 100644
--- a/gm/arcofzorro.cpp
+++ b/gm/arcofzorro.cpp
@@ -29,7 +29,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1000, 1000);
+ return SkISize::Make(1000, 1000);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 6a9e65bdec..9252a586ce 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -50,7 +50,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(800, 800);
+ return SkISize::Make(800, 800);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE {
@@ -208,7 +208,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(800, 800);
+ return SkISize::Make(800, 800);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE {
@@ -399,7 +399,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(800, 800);
+ return SkISize::Make(800, 800);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE {
diff --git a/gm/bicubicfilter.cpp b/gm/bicubicfilter.cpp
index ebaed51d0d..0f33b6f871 100644
--- a/gm/bicubicfilter.cpp
+++ b/gm/bicubicfilter.cpp
@@ -45,7 +45,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(400, 300);
+ return SkISize::Make(400, 300);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp
index 788111497a..105bd452d9 100644
--- a/gm/bigblurs.cpp
+++ b/gm/bigblurs.cpp
@@ -28,7 +28,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(kWidth, kHeight);
+ return SkISize::Make(kWidth, kHeight);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp
index 288e827589..3ad128e651 100644
--- a/gm/bigmatrix.cpp
+++ b/gm/bigmatrix.cpp
@@ -28,7 +28,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(50, 50);
+ return SkISize::Make(50, 50);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp
index b441e34f56..eaad8d0114 100644
--- a/gm/bitmapcopy.cpp
+++ b/gm/bitmapcopy.cpp
@@ -57,7 +57,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(540, 330);
+ return SkISize::Make(540, 330);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp
index 5fa213062b..37d49c3fea 100644
--- a/gm/bitmapfilters.cpp
+++ b/gm/bitmapfilters.cpp
@@ -102,7 +102,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(540, 330);
+ return SkISize::Make(540, 330);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/bitmapmatrix.cpp b/gm/bitmapmatrix.cpp
index b5b8e59dc1..052d153316 100644
--- a/gm/bitmapmatrix.cpp
+++ b/gm/bitmapmatrix.cpp
@@ -32,7 +32,7 @@ protected:
return SkString("drawbitmapmatrix");
}
- virtual SkISize onISize() SK_OVERRIDE { return make_isize(1024, 256); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(1024, 256); }
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkBitmap bm;
diff --git a/gm/bitmapscroll.cpp b/gm/bitmapscroll.cpp
index ee5efc0e7d..7e23d8bf05 100644
--- a/gm/bitmapscroll.cpp
+++ b/gm/bitmapscroll.cpp
@@ -68,7 +68,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(800, 600);
+ return SkISize::Make(800, 600);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/blurs.cpp b/gm/blurs.cpp
index bc73d9577f..8a8949a14c 100644
--- a/gm/blurs.cpp
+++ b/gm/blurs.cpp
@@ -27,7 +27,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(700, 500);
+ return SkISize::Make(700, 500);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/circles.cpp b/gm/circles.cpp
index e69a96d300..734fcb5a0b 100644
--- a/gm/circles.cpp
+++ b/gm/circles.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1200, 900);
+ return SkISize::Make(1200, 900);
}
void makePaints() {
diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp
index f8728c26cb..b30fd4d315 100644
--- a/gm/cmykjpeg.cpp
+++ b/gm/cmykjpeg.cpp
@@ -54,7 +54,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp
index a935c979f8..39c70bd707 100644
--- a/gm/coloremoji.cpp
+++ b/gm/coloremoji.cpp
@@ -45,7 +45,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp
index 862bdf9d51..841f36a139 100644
--- a/gm/colormatrix.cpp
+++ b/gm/colormatrix.cpp
@@ -58,7 +58,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
SkBitmap createSolidBitmap(int width, int height) {
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index 987b20133e..14e77b9077 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -42,7 +42,7 @@ protected:
return str;
}
- SkISize onISize() { return make_isize(970, 780); }
+ SkISize onISize() { return SkISize::Make(970, 780); }
virtual void onDraw(SkCanvas* canvas) {
SkPath path;
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index 4c69cadc3c..f99d5b484d 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -131,8 +131,8 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(SkScalarRoundToInt(fTotalWidth),
- SkScalarRoundToInt(fTotalHeight));
+ return SkISize::Make(SkScalarRoundToInt(fTotalWidth),
+ SkScalarRoundToInt(fTotalHeight));
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index 9acabe1e61..b869887a97 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -44,7 +44,7 @@ protected:
virtual SkISize onISize() {
- return make_isize(1200, 1100);
+ return SkISize::Make(1200, 1100);
}
void makePaths() {
diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index edafea2f97..6de72dc3b6 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -88,7 +88,7 @@ protected:
if (kBench_Mode != this->getMode()) {
w *= 2;
}
- return make_isize(w, 540);
+ return SkISize::Make(w, 540);
}
virtual void onOnceBeforeDraw() SK_OVERRIDE {
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 4e79500459..08bd88752c 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -44,7 +44,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(720, 800);
+ return SkISize::Make(720, 800);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE {
diff --git a/gm/copyTo4444.cpp b/gm/copyTo4444.cpp
index 6233301fed..ed0c046fa9 100644
--- a/gm/copyTo4444.cpp
+++ b/gm/copyTo4444.cpp
@@ -25,7 +25,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(1024, 512);
+ return SkISize::Make(1024, 512);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index 9868d315db..5a812b0e47 100644
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -46,7 +46,7 @@ protected:
return SkString("dashing");
}
- SkISize onISize() { return skiagm::make_isize(640, 300); }
+ SkISize onISize() { return SkISize::Make(640, 300); }
virtual void onDraw(SkCanvas* canvas) {
static const struct {
@@ -132,7 +132,7 @@ protected:
return SkString("dashing2");
}
- SkISize onISize() { return skiagm::make_isize(640, 480); }
+ SkISize onISize() { return SkISize::Make(640, 480); }
virtual void onDraw(SkCanvas* canvas) {
static const int gIntervals[] = {
@@ -194,7 +194,7 @@ protected:
return SkString("dashing3");
}
- SkISize onISize() { return skiagm::make_isize(640, 480); }
+ SkISize onISize() { return SkISize::Make(640, 480); }
// Draw a 100x100 block of dashed lines. The horizontal ones are BW
// while the vertical ones are AA.
@@ -328,7 +328,7 @@ protected:
return SkString("dashing4");
}
- SkISize onISize() { return skiagm::make_isize(640, 950); }
+ SkISize onISize() { return SkISize::Make(640, 950); }
virtual void onDraw(SkCanvas* canvas) {
static const struct {
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index 022f1b1920..e8de51561d 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -30,7 +30,7 @@ protected:
return SkString("degeneratesegments");
}
- SkISize onISize() { return make_isize(896, 930); }
+ SkISize onISize() { return SkISize::Make(896, 930); }
typedef SkPoint (*AddSegmentFunc)(SkPath&, SkPoint&);
diff --git a/gm/deviceproperties.cpp b/gm/deviceproperties.cpp
index 20839463ad..92a3d51bb7 100644
--- a/gm/deviceproperties.cpp
+++ b/gm/deviceproperties.cpp
@@ -25,7 +25,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(1450, 750);
+ return SkISize::Make(1450, 750);
}
static void rotate_about(SkCanvas* canvas,
diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index af7c772532..eb4a0083c6 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -65,7 +65,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(500, 500);
+ return SkISize::Make(500, 500);
}
void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
diff --git a/gm/distantclip.cpp b/gm/distantclip.cpp
index 9c2a5b6de1..9c44140d8e 100644
--- a/gm/distantclip.cpp
+++ b/gm/distantclip.cpp
@@ -24,7 +24,7 @@ protected:
return SkString("distantclip");
}
- SkISize onISize() { return make_isize(100, 100); }
+ SkISize onISize() { return SkISize::Make(100, 100); }
virtual void onDraw(SkCanvas* canvas) {
int offset = 35000;
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 33a13f0fe9..9c6fa3b027 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -86,7 +86,7 @@ protected:
return SkString("drawbitmaprect");
}
- SkISize onISize() { return make_isize(gSize, gSize); }
+ SkISize onISize() { return SkISize::Make(gSize, gSize); }
virtual void onDraw(SkCanvas* canvas) {
static const int kBmpSize = 2048;
diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp
index 7b3a7e606a..6b9322292e 100644
--- a/gm/emptypath.cpp
+++ b/gm/emptypath.cpp
@@ -21,7 +21,7 @@ protected:
return SkString("emptypath");
}
- SkISize onISize() { return make_isize(600, 280); }
+ SkISize onISize() { return SkISize::Make(600, 280); }
void drawEmpty(SkCanvas* canvas,
SkColor color,
diff --git a/gm/etc1bitmap.cpp b/gm/etc1bitmap.cpp
index ce0aa7dbad..42c152f887 100644
--- a/gm/etc1bitmap.cpp
+++ b/gm/etc1bitmap.cpp
@@ -86,7 +86,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(128, 128);
+ return SkISize::Make(128, 128);
}
virtual SkString fileExtension() const = 0;
@@ -162,7 +162,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(124, 124);
+ return SkISize::Make(124, 124);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/extractbitmap.cpp b/gm/extractbitmap.cpp
index 6e7409da2d..711a20a481 100644
--- a/gm/extractbitmap.cpp
+++ b/gm/extractbitmap.cpp
@@ -37,7 +37,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(600, 600);
+ return SkISize::Make(600, 600);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/factory.cpp b/gm/factory.cpp
index aa643a2c5b..9b7450e3a3 100644
--- a/gm/factory.cpp
+++ b/gm/factory.cpp
@@ -47,7 +47,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp
index bc9de530a3..8859ea1191 100644
--- a/gm/filltypes.cpp
+++ b/gm/filltypes.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(835, 840);
+ return SkISize::Make(835, 840);
}
void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp
index 9d0827c449..21def99c51 100644
--- a/gm/filltypespersp.cpp
+++ b/gm/filltypespersp.cpp
@@ -33,7 +33,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(835, 840);
+ return SkISize::Make(835, 840);
}
void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp
index a88710217b..8a97e69970 100644
--- a/gm/fontscaler.cpp
+++ b/gm/fontscaler.cpp
@@ -28,7 +28,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(1450, 750);
+ return SkISize::Make(1450, 750);
}
static void rotate_about(SkCanvas* canvas,
diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp
index f520754123..f10680e567 100644
--- a/gm/gammatext.cpp
+++ b/gm/gammatext.cpp
@@ -122,7 +122,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(1024, HEIGHT);
+ return SkISize::Make(1024, HEIGHT);
}
static void drawGrad(SkCanvas* canvas) {
diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index 0cb5bb3ede..0f66a976b5 100644
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -24,7 +24,7 @@ protected:
return SkString("getpostextpath");
}
- SkISize onISize() { return skiagm::make_isize(480, 780); }
+ SkISize onISize() { return SkISize::Make(480, 780); }
static void strokePath(SkCanvas* canvas, const SkPath& path) {
SkPaint paint;
diff --git a/gm/gm.h b/gm/gm.h
index a48976b20e..90fe47bd41 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -25,12 +25,6 @@
namespace skiagm {
- static inline SkISize make_isize(int w, int h) {
- SkISize sz;
- sz.set(w, h);
- return sz;
- }
-
class GM {
public:
GM();
diff --git a/gm/gradientDirtyLaundry.cpp b/gm/gradientDirtyLaundry.cpp
index baa7471ef2..ea412039d8 100644
--- a/gm/gradientDirtyLaundry.cpp
+++ b/gm/gradientDirtyLaundry.cpp
@@ -75,7 +75,7 @@ protected:
}
SkString onShortName() SK_OVERRIDE { return SkString("gradient_dirty_laundry"); }
- virtual SkISize onISize() SK_OVERRIDE { return make_isize(640, 615); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); }
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPoint pts[2] = { { 0, 0 },
diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp
index fcbba45ae7..041807b42a 100644
--- a/gm/gradients_no_texture.cpp
+++ b/gm/gradients_no_texture.cpp
@@ -90,7 +90,7 @@ protected:
}
SkString onShortName() SK_OVERRIDE { return SkString("gradients_no_texture"); }
- virtual SkISize onISize() SK_OVERRIDE { return make_isize(640, 615); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 615); }
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
static const SkPoint kPts[2] = { { 0, 0 },
diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp
index 42513b73de..5fac185c9d 100644
--- a/gm/gradtext.cpp
+++ b/gm/gradtext.cpp
@@ -44,7 +44,7 @@ public:
protected:
virtual SkString onShortName() { return SkString("chrome_gradtext1"); }
- virtual SkISize onISize() { return make_isize(500, 480); }
+ virtual SkISize onISize() { return SkISize::Make(500, 480); }
virtual void onDraw(SkCanvas* canvas) {
SkPaint paint;
SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
@@ -72,7 +72,7 @@ public:
protected:
virtual SkString onShortName() { return SkString("chrome_gradtext2"); }
- virtual SkISize onISize() { return make_isize(500, 480); }
+ virtual SkISize onISize() { return SkISize::Make(500, 480); }
virtual void onDraw(SkCanvas* canvas) {
SkPaint paint;
@@ -109,7 +109,7 @@ protected:
return SkString("gradtext");
}
- virtual SkISize onISize() { return make_isize(500, 480); }
+ virtual SkISize onISize() { return SkISize::Make(500, 480); }
static void draw_text(SkCanvas* canvas, const SkPaint& paint) {
const char* text = "When in the course of human events";
diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp
index 5a512d291f..e017d8b22d 100644
--- a/gm/hairlines.cpp
+++ b/gm/hairlines.cpp
@@ -22,7 +22,7 @@ protected:
return SkString("hairlines");
}
- virtual SkISize onISize() { return make_isize(800, 600); }
+ virtual SkISize onISize() { return SkISize::Make(800, 600); }
virtual void onOnceBeforeDraw() SK_OVERRIDE {
{
diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp
index f1fa260ef7..9e9a1de53c 100644
--- a/gm/hairmodes.cpp
+++ b/gm/hairmodes.cpp
@@ -82,7 +82,7 @@ namespace skiagm {
return SkString("hairmodes");
}
- virtual SkISize onISize() { return make_isize(640, 480); }
+ virtual SkISize onISize() { return SkISize::Make(640, 480); }
virtual void onOnceBeforeDraw() SK_OVERRIDE {
fBGPaint.setShader(make_bg_shader())->unref();
diff --git a/gm/imagealphathreshold.cpp b/gm/imagealphathreshold.cpp
index 0e13945899..947f72acee 100644
--- a/gm/imagealphathreshold.cpp
+++ b/gm/imagealphathreshold.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp
index 0b1ab3077f..b8e1971711 100644
--- a/gm/imageblur.cpp
+++ b/gm/imageblur.cpp
@@ -32,7 +32,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/imageblurtiled.cpp b/gm/imageblurtiled.cpp
index 7200b1b418..0580405dfe 100644
--- a/gm/imageblurtiled.cpp
+++ b/gm/imageblurtiled.cpp
@@ -26,7 +26,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp
index 7851f2e984..ec031c9515 100644
--- a/gm/imagefiltersclipped.cpp
+++ b/gm/imagefiltersclipped.cpp
@@ -40,7 +40,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(860, 500);
+ return SkISize::Make(860, 500);
}
void make_checkerboard() {
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp
index c4a65b3407..57552dfddb 100644
--- a/gm/imagefiltersscaled.cpp
+++ b/gm/imagefiltersscaled.cpp
@@ -40,7 +40,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(1428, 500);
+ return SkISize::Make(1428, 500);
}
void make_checkerboard() {
diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp
index 66961c915e..23847e6f15 100644
--- a/gm/imagemagnifier.cpp
+++ b/gm/imagemagnifier.cpp
@@ -31,7 +31,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp
index afa18baf64..ff02020813 100644
--- a/gm/imageresizetiled.cpp
+++ b/gm/imageresizetiled.cpp
@@ -27,7 +27,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp
index 3fdbbd51fc..7e5ce62b02 100644
--- a/gm/internal_links.cpp
+++ b/gm/internal_links.cpp
@@ -29,7 +29,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(700, 500);
+ return SkISize::Make(700, 500);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/inversepaths.cpp b/gm/inversepaths.cpp
index e5b16267ab..c7161597c2 100644
--- a/gm/inversepaths.cpp
+++ b/gm/inversepaths.cpp
@@ -79,7 +79,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(800, 900);
+ return SkISize::Make(800, 900);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/lcdtext.cpp b/gm/lcdtext.cpp
index 706d4fdc79..f48dc9e2f3 100644
--- a/gm/lcdtext.cpp
+++ b/gm/lcdtext.cpp
@@ -28,7 +28,7 @@ protected:
return SkString("lcdtext");
}
- SkISize onISize() { return make_isize(640, 480); }
+ SkISize onISize() { return SkISize::Make(640, 480); }
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp
index 3b0ae75461..ea4fdc887f 100644
--- a/gm/linepaths.cpp
+++ b/gm/linepaths.cpp
@@ -24,7 +24,7 @@ protected:
return SkString("linepath");
}
- SkISize onISize() { return make_isize(1240, 390); }
+ SkISize onISize() { return SkISize::Make(1240, 390); }
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
@@ -165,7 +165,7 @@ protected:
return SkString("lineclosepath");
}
- SkISize onISize() { return make_isize(1240, 390); }
+ SkISize onISize() { return SkISize::Make(1240, 390); }
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp
index c081bf5f35..592489c6e8 100644
--- a/gm/matrixconvolution.cpp
+++ b/gm/matrixconvolution.cpp
@@ -46,7 +46,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(500, 300);
+ return SkISize::Make(500, 300);
}
void draw(SkCanvas* canvas, int x, int y, const SkIPoint& kernelOffset,
diff --git a/gm/matriximagefilter.cpp b/gm/matriximagefilter.cpp
index 29dec39b9e..59c5106b7a 100644
--- a/gm/matriximagefilter.cpp
+++ b/gm/matriximagefilter.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(420, 100);
+ return SkISize::Make(420, 100);
}
void make_checkerboard(SkBitmap* bitmap) {
diff --git a/gm/mixedxfermodes.cpp b/gm/mixedxfermodes.cpp
index 43f8e897eb..a5023e1b0b 100644
--- a/gm/mixedxfermodes.cpp
+++ b/gm/mixedxfermodes.cpp
@@ -27,7 +27,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(790, 640);
+ return SkISize::Make(790, 640);
}
void drawShape(SkCanvas* canvas,
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp
index 9ac8ddd812..96b31cb6ef 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -65,7 +65,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/morphology.cpp b/gm/morphology.cpp
index 0b4d3af224..ff6c1bac6c 100644
--- a/gm/morphology.cpp
+++ b/gm/morphology.cpp
@@ -40,7 +40,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
void drawClippedBitmap(SkCanvas* canvas, const SkPaint& paint, int x, int y) {
diff --git a/gm/nested.cpp b/gm/nested.cpp
index e72e5c4280..5a337f4153 100644
--- a/gm/nested.cpp
+++ b/gm/nested.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(kImageWidth, kImageHeight);
+ return SkISize::Make(kImageWidth, kImageHeight);
}
enum Shapes {
diff --git a/gm/ninepatchstretch.cpp b/gm/ninepatchstretch.cpp
index 8806acc895..b6f1a6008a 100644
--- a/gm/ninepatchstretch.cpp
+++ b/gm/ninepatchstretch.cpp
@@ -53,7 +53,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(400, 400);
+ return SkISize::Make(400, 400);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/offsetimagefilter.cpp b/gm/offsetimagefilter.cpp
index 54597310ab..ca8a80997e 100644
--- a/gm/offsetimagefilter.cpp
+++ b/gm/offsetimagefilter.cpp
@@ -60,7 +60,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
void drawClippedBitmap(SkCanvas* canvas, const SkBitmap& bitmap, const SkPaint& paint, SkScalar scale, const SkIRect& cropRect) {
diff --git a/gm/ovals.cpp b/gm/ovals.cpp
index 9f007acf81..4afabc284d 100755
--- a/gm/ovals.cpp
+++ b/gm/ovals.cpp
@@ -35,7 +35,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1200, 900);
+ return SkISize::Make(1200, 900);
}
void makePaints() {
diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp
index 35bb84a0cf..7177a531f1 100644
--- a/gm/patheffects.cpp
+++ b/gm/patheffects.cpp
@@ -115,7 +115,7 @@ protected:
return SkString("patheffect");
}
- SkISize onISize() { return make_isize(800, 600); }
+ SkISize onISize() { return SkISize::Make(800, 600); }
virtual void onDraw(SkCanvas* canvas) {
SkPaint paint;
diff --git a/gm/pathopsinverse.cpp b/gm/pathopsinverse.cpp
index ec4d4d38f1..bdd8217f57 100644
--- a/gm/pathopsinverse.cpp
+++ b/gm/pathopsinverse.cpp
@@ -59,7 +59,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1200, 900);
+ return SkISize::Make(1200, 900);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/pathopsskpclip.cpp b/gm/pathopsskpclip.cpp
index 076f733af3..31d532d9d8 100644
--- a/gm/pathopsskpclip.cpp
+++ b/gm/pathopsskpclip.cpp
@@ -33,7 +33,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1200, 900);
+ return SkISize::Make(1200, 900);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/pathreverse.cpp b/gm/pathreverse.cpp
index 51c0d524b7..77687f4e4a 100644
--- a/gm/pathreverse.cpp
+++ b/gm/pathreverse.cpp
@@ -78,7 +78,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/points.cpp b/gm/points.cpp
index f4df741092..793e2e8f4f 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -24,7 +24,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 490);
+ return SkISize::Make(640, 490);
}
static void fill_pts(SkPoint pts[], size_t n, SkLCGRandom* rand) {
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp
index decf50a96e..f21fdd98e1 100644
--- a/gm/quadpaths.cpp
+++ b/gm/quadpaths.cpp
@@ -24,7 +24,7 @@ protected:
return SkString("quadpath");
}
- SkISize onISize() { return make_isize(1240, 390); }
+ SkISize onISize() { return SkISize::Make(1240, 390); }
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
@@ -170,7 +170,7 @@ protected:
return SkString("quadclosepath");
}
- SkISize onISize() { return make_isize(1240, 390); }
+ SkISize onISize() { return SkISize::Make(1240, 390); }
void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
diff --git a/gm/rects.cpp b/gm/rects.cpp
index a8d718855e..217d849548 100644
--- a/gm/rects.cpp
+++ b/gm/rects.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1200, 900);
+ return SkISize::Make(1200, 900);
}
void makePaints() {
diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp
index 417f4f47a8..6b5fa4aef9 100644
--- a/gm/resizeimagefilter.cpp
+++ b/gm/resizeimagefilter.cpp
@@ -60,7 +60,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(520, 100);
+ return SkISize::Make(520, 100);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp
index b6e5a2754d..669763d9a7 100644
--- a/gm/roundrects.cpp
+++ b/gm/roundrects.cpp
@@ -36,7 +36,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(1200, 900);
+ return SkISize::Make(1200, 900);
}
void makePaints() {
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 8e4b199c72..24636cae8d 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -54,7 +54,7 @@ protected:
return name;
}
- virtual SkISize onISize() SK_OVERRIDE { return make_isize(kImageWidth, kImageHeight); }
+ virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(kImageWidth, kImageHeight); }
virtual uint32_t onGetFlags() const SK_OVERRIDE {
if (kEffect_Type == fType) {
diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp
index a809c25c3d..ef84f35fc1 100644
--- a/gm/samplerstress.cpp
+++ b/gm/samplerstress.cpp
@@ -37,7 +37,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
/**
diff --git a/gm/selftest.cpp b/gm/selftest.cpp
index dd6e67b50b..a332c5d15d 100644
--- a/gm/selftest.cpp
+++ b/gm/selftest.cpp
@@ -26,7 +26,7 @@ protected:
return fName;
}
- SkISize onISize() { return skiagm::make_isize(kWidth, kHeight); }
+ SkISize onISize() { return SkISize::Make(kWidth, kHeight); }
virtual void onDraw(SkCanvas* canvas) {
SkPaint paint;
diff --git a/gm/shaderbounds.cpp b/gm/shaderbounds.cpp
index f82985bf52..55e334cb3a 100644
--- a/gm/shaderbounds.cpp
+++ b/gm/shaderbounds.cpp
@@ -42,7 +42,7 @@ protected:
return fName;
}
- virtual SkISize onISize() { return make_isize(320, 240); }
+ virtual SkISize onISize() { return SkISize::Make(320, 240); }
virtual SkMatrix onGetInitialTransform() const SK_OVERRIDE {
SkMatrix result;
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp
index 4936801320..ac858468f6 100644
--- a/gm/shadertext.cpp
+++ b/gm/shadertext.cpp
@@ -108,7 +108,7 @@ protected:
return SkString("shadertext");
}
- SkISize onISize() { return make_isize(1450, 500); }
+ SkISize onISize() { return SkISize::Make(1450, 500); }
virtual void onDraw(SkCanvas* canvas) {
const char text[] = "Shaded Text";
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp
index 27b517517e..f625d6c02a 100644
--- a/gm/shadertext2.cpp
+++ b/gm/shadertext2.cpp
@@ -52,7 +52,7 @@ protected:
return SkString("shadertext2");
}
- SkISize onISize() { return make_isize(1800, 900); }
+ SkISize onISize() { return SkISize::Make(1800, 900); }
virtual void onDraw(SkCanvas* canvas) {
static const char kText[] = "SKIA";
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp
index 3c6400d8d6..78efe87524 100644
--- a/gm/shadertext3.cpp
+++ b/gm/shadertext3.cpp
@@ -60,7 +60,7 @@ protected:
return SkString("shadertext3");
}
- virtual SkISize onISize() SK_OVERRIDE{ return make_isize(800, 1000); }
+ virtual SkISize onISize() SK_OVERRIDE{ return SkISize::Make(800, 1000); }
virtual void onOnceBeforeDraw() SK_OVERRIDE {
makebm(&fBmp, kPointSize / 4, kPointSize / 4);
diff --git a/gm/shadows.cpp b/gm/shadows.cpp
index d5458e0833..ca49a02bd3 100644
--- a/gm/shadows.cpp
+++ b/gm/shadows.cpp
@@ -45,7 +45,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(200, 120);
+ return SkISize::Make(200, 120);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index 1e51f99395..201f9bc603 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -138,7 +138,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp
index 893ad94593..6a4bd92b54 100644
--- a/gm/skbug1719.cpp
+++ b/gm/skbug1719.cpp
@@ -33,7 +33,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(300, 100);
+ return SkISize::Make(300, 100);
}
virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp
index ce74b396b8..5f943df6ce 100644
--- a/gm/strokefill.cpp
+++ b/gm/strokefill.cpp
@@ -28,7 +28,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(640, 480);
+ return SkISize::Make(640, 480);
}
static void show_bold(SkCanvas* canvas, const void* text, int len,
diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp
index eb37f32baf..f3445cc35d 100644
--- a/gm/strokerects.cpp
+++ b/gm/strokerects.cpp
@@ -34,7 +34,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(W*2, H*2);
+ return SkISize::Make(W*2, H*2);
}
static void rnd_rect(SkRect* r, SkLCGRandom& rand) {
diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index 72735a160f..ca82292f2f 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -31,7 +31,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(2*S, 2*S);
+ return SkISize::Make(2*S, 2*S);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; }
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index babf80029e..5f319779e5 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -35,7 +35,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(400, 800);
+ return SkISize::Make(400, 800);
}
virtual uint32_t onGetFlags() const SK_OVERRIDE {
diff --git a/gm/thinrects.cpp b/gm/thinrects.cpp
index 7e30a20adf..6517fe2796 100644
--- a/gm/thinrects.cpp
+++ b/gm/thinrects.cpp
@@ -22,7 +22,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(240, 320);
+ return SkISize::Make(240, 320);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/thinstrokedrects.cpp b/gm/thinstrokedrects.cpp
index 19746f79a7..37ffb35620 100644
--- a/gm/thinstrokedrects.cpp
+++ b/gm/thinstrokedrects.cpp
@@ -26,7 +26,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(240, 320);
+ return SkISize::Make(240, 320);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp
index c7842ee97c..210a646a6f 100644
--- a/gm/tileimagefilter.cpp
+++ b/gm/tileimagefilter.cpp
@@ -62,7 +62,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index 92bf7c645f..a188af9c65 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -40,7 +40,7 @@ protected:
return SkString("tinybitmap");
}
- virtual SkISize onISize() { return make_isize(100, 100); }
+ virtual SkISize onISize() { return SkISize::Make(100, 100); }
virtual void onDraw(SkCanvas* canvas) {
SkBitmap bm = make_bitmap();
diff --git a/gm/twopointradial.cpp b/gm/twopointradial.cpp
index f4a4ddfb3b..4118a69aab 100644
--- a/gm/twopointradial.cpp
+++ b/gm/twopointradial.cpp
@@ -64,7 +64,7 @@ protected:
return SkString("twopointconical");
}
- SkISize onISize() { return skiagm::make_isize(480, 780); }
+ SkISize onISize() { return SkISize::Make(480, 780); }
virtual void onDraw(SkCanvas* canvas) {
if (false) {
diff --git a/gm/verttext.cpp b/gm/verttext.cpp
index 736a5cf607..944a6db876 100644
--- a/gm/verttext.cpp
+++ b/gm/verttext.cpp
@@ -57,7 +57,7 @@ protected:
return SkString("verttext");
}
- SkISize onISize() { return make_isize(640, 480); }
+ SkISize onISize() { return SkISize::Make(640, 480); }
static void drawBaseline(SkCanvas* canvas, const SkPaint& paint,
SkScalar x, SkScalar y) {
diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp
index 331b99d2c5..b0375eeb64 100644
--- a/gm/verttext2.cpp
+++ b/gm/verttext2.cpp
@@ -40,7 +40,7 @@ protected:
return SkString("verttext2");
}
- SkISize onISize() { return make_isize(640, 480); }
+ SkISize onISize() { return SkISize::Make(640, 480); }
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp
index 2b14f4dfaa..584e60b194 100644
--- a/gm/xfermodeimagefilter.cpp
+++ b/gm/xfermodeimagefilter.cpp
@@ -62,7 +62,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(WIDTH, HEIGHT);
+ return SkISize::Make(WIDTH, HEIGHT);
}
static void drawClippedBitmap(SkCanvas* canvas, const SkBitmap& bitmap, const SkPaint& paint,
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp
index 16d6cbb34b..c9299b374b 100644
--- a/gm/xfermodes.cpp
+++ b/gm/xfermodes.cpp
@@ -166,7 +166,7 @@ protected:
}
virtual SkISize onISize() {
- return make_isize(1990, 640);
+ return SkISize::Make(1990, 640);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp
index 2ccabc61cb..0f3735e2ab 100644
--- a/gm/xfermodes2.cpp
+++ b/gm/xfermodes2.cpp
@@ -23,7 +23,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(455, 475);
+ return SkISize::Make(455, 475);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp
index d5790d5e8a..92367f37bc 100644
--- a/gm/xfermodes3.cpp
+++ b/gm/xfermodes3.cpp
@@ -32,7 +32,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return make_isize(630, 1215);
+ return SkISize::Make(630, 1215);
}
virtual void onDrawBackground(SkCanvas* canvas) SK_OVERRIDE {