aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/blurroundrect.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-28 14:44:54 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-28 14:44:54 +0000
commitc76a4b2a81b5c502ded23dee1e0c5d762028d5cf (patch)
tree21dd269997915875e307d03f5f6bde98b20e1c9d /gm/blurroundrect.cpp
parentcced37d2c3e49231e6a155721e0dd59e58e67bab (diff)
Revert of Fast path for blurred round rects -- blur a small 9patch rect on the CPU (https://codereview.chromium.org/248613004/)
Reason for revert: Looks like this causes unit tests to fail with a zero constructor like this one: http://108.170.220.120:10117/builders/Test-Win7-ShuttleA-HD2000-x86-Release/builds/2326/steps/RunTests/logs/stdio Original issue's description: > Fast path for blurred round rects -- blur a small 9patch rect on the CPU > And nonlinearly stretch the resulting texture across proxy geometry. > > BUG= > > Committed: http://code.google.com/p/skia/source/detail?r=14392 R=bsalomon@google.com, reed@google.com, humper@google.com TBR=bsalomon@google.com, humper@google.com, reed@google.com NOTREECHECKS=true NOTRY=true BUG= Author: caryclark@google.com Review URL: https://codereview.chromium.org/258893010 git-svn-id: http://skia.googlecode.com/svn/trunk@14400 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/blurroundrect.cpp')
-rw-r--r--gm/blurroundrect.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp
index 08086aca91..f688380f0e 100644
--- a/gm/blurroundrect.cpp
+++ b/gm/blurroundrect.cpp
@@ -106,32 +106,30 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return SkISize::Make(950, 950);
+ return SkISize::Make(750, 750);
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->scale(1.5f, 1.5f);
- canvas->translate(50,50);
- const float blurRadii[] = { 1,5,10,20 };
- const int cornerRadii[] = { 1,5,10,20 };
+ const int blurRadii[] = { 1, 3, 6, 10 };
+ const int cornerRadii[] = { 1, 3, 6, 10 };
const SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
for (size_t i = 0; i < SK_ARRAY_COUNT(blurRadii); ++i) {
SkAutoCanvasRestore autoRestore(canvas, true);
- canvas->translate(0, (r.height() + SkIntToScalar(50)) * i);
+ canvas->translate(0, (r.height() + SkIntToScalar(20)) * i);
for (size_t j = 0; j < SK_ARRAY_COUNT(cornerRadii); ++j) {
SkMaskFilter* filter = SkBlurMaskFilter::Create(
SkBlurMaskFilter::kNormal_BlurStyle,
- SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])),
- SkBlurMaskFilter::kHighQuality_BlurFlag);
+ SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i])));
SkPaint paint;
- paint.setColor(SK_ColorBLACK);
+ paint.setColor(SK_ColorBLUE);
paint.setMaskFilter(filter)->unref();
SkRRect rrect;
rrect.setRectXY(r, SkIntToScalar(cornerRadii[j]), SkIntToScalar(cornerRadii[j]));
canvas->drawRRect(rrect, paint);
- canvas->translate(r.width() + SkIntToScalar(50), 0);
+ canvas->translate(r.width() + SkIntToScalar(10), 0);
}
}
}