aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-04-11 07:46:38 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-11 07:46:38 -0700
commit6dc14aab5ea6be87b5b10f17a19737f586708768 (patch)
tree37179e599a743c500720432fb346efbb933d7ee3
parente6277de4ebb1b00a15f8f3c7cd9d6027c6b021fe (diff)
adjust gm bounds for better content fit
-rw-r--r--gm/colorfilterimagefilter.cpp2
-rw-r--r--gm/colorfilters.cpp2
-rw-r--r--gm/dashcubics.cpp2
-rw-r--r--gm/dashing.cpp4
-rw-r--r--gm/shadertext3.cpp2
-rw-r--r--gm/stringart.cpp4
-rw-r--r--gm/tallstretchedbitmaps.cpp2
-rw-r--r--gm/textblobmixedsizes.cpp4
-rw-r--r--gm/tilemodes.cpp2
-rw-r--r--gm/tilemodes_scaled.cpp2
10 files changed, 14 insertions, 12 deletions
diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index 6031ba7670..7b54e5e50d 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -190,7 +190,7 @@ public:
~SkTRefArray() { this->unrefAll(); }
};
-DEF_SIMPLE_GM(colorfiltershader, canvas, 800, 800) {
+DEF_SIMPLE_GM(colorfiltershader, canvas, 610, 450) {
SkTArray<sk_sp<SkColorFilter>> filters;
sk_gm_get_colorfilters(&filters);
diff --git a/gm/colorfilters.cpp b/gm/colorfilters.cpp
index 635298533b..2accf536db 100644
--- a/gm/colorfilters.cpp
+++ b/gm/colorfilters.cpp
@@ -45,7 +45,7 @@ protected:
}
virtual SkISize onISize() override {
- return SkISize::Make(640, 480);
+ return SkISize::Make(620, 430);
}
void onDraw(SkCanvas* canvas) override {
diff --git a/gm/dashcubics.cpp b/gm/dashcubics.cpp
index 7736f2b47c..e8d7f5bc8e 100644
--- a/gm/dashcubics.cpp
+++ b/gm/dashcubics.cpp
@@ -34,7 +34,7 @@ static void flower(SkCanvas* canvas, const SkPath& path, SkScalar intervals[2],
canvas->drawPath(path, paint);
}
-DEF_SIMPLE_GM(dashcubics, canvas, 860, 700) {
+DEF_SIMPLE_GM(dashcubics, canvas, 865, 750) {
SkPath path;
const char* d = "M 337,98 C 250,141 250,212 250,212 C 250,212 250,212 250,212"
"C 250,212 250,212 250,212 C 250,212 250,141 163,98 C 156,195 217,231 217,231"
diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index 95fc15a9fc..82e6eb35bf 100644
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -476,7 +476,7 @@ private:
bool fDoAA;
};
-DEF_SIMPLE_GM(longpathdash, canvas, 512, 512) {
+DEF_SIMPLE_GM(longpathdash, canvas, 612, 612) {
SkPath lines;
for (int x = 32; x < 256; x += 16) {
for (SkScalar a = 0; a < 3.141592f * 2; a += 0.03141592f) {
@@ -499,6 +499,8 @@ DEF_SIMPLE_GM(longpathdash, canvas, 512, 512) {
p.setStrokeWidth(1);
const SkScalar intervals[] = { 1, 1 };
p.setPathEffect(SkDashPathEffect::Make(intervals, SK_ARRAY_COUNT(intervals), 0));
+
+ canvas->translate(50, 50);
canvas->drawPath(lines, p);
}
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp
index 0d1c03e345..9f3301ee04 100644
--- a/gm/shadertext3.cpp
+++ b/gm/shadertext3.cpp
@@ -57,7 +57,7 @@ protected:
return SkString("shadertext3");
}
- SkISize onISize() override{ return SkISize::Make(800, 1000); }
+ SkISize onISize() override{ return SkISize::Make(820, 930); }
void onOnceBeforeDraw() override {
makebm(&fBmp, kPointSize / 4, kPointSize / 4);
diff --git a/gm/stringart.cpp b/gm/stringart.cpp
index 7eaac85ebc..1da87578d0 100644
--- a/gm/stringart.cpp
+++ b/gm/stringart.cpp
@@ -12,8 +12,8 @@
// Reproduces https://code.google.com/p/chromium/issues/detail?id=279014
-static const int kWidth = 640;
-static const int kHeight = 480;
+static const int kWidth = 440;
+static const int kHeight = 440;
static const SkScalar kAngle = 0.305f;
static const int kMaxNumSteps = 140;
diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp
index dfd31a0f50..f22f2d2663 100644
--- a/gm/tallstretchedbitmaps.cpp
+++ b/gm/tallstretchedbitmaps.cpp
@@ -64,7 +64,7 @@ protected:
}
SkISize onISize() override {
- return SkISize::Make(750, 750);
+ return SkISize::Make(730, 690);
}
void onOnceBeforeDraw() override {
diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp
index 6041e521fd..e7eda399fc 100644
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -181,8 +181,8 @@ protected:
private:
SkAutoTUnref<const SkTextBlob> fBlob;
- static const int kWidth = 2000;
- static const int kHeight = 2000;
+ static const int kWidth = 2100;
+ static const int kHeight = 1900;
bool fUseDFT;
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index b7f0d45096..bd2dcfef16 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -194,7 +194,7 @@ protected:
return fName;
}
- SkISize onISize() override { return SkISize::Make(880, 560); }
+ SkISize onISize() override { return SkISize::Make(650, 610); }
void onDraw(SkCanvas* canvas) override {
canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index 3bcb0fab39..1645f80b22 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -199,7 +199,7 @@ protected:
return fName;
}
- SkISize onISize() override { return SkISize::Make(880, 560); }
+ SkISize onISize() override { return SkISize::Make(650, 610); }
void onDraw(SkCanvas* canvas) override {
canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);