diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-20 00:49:57 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-20 00:49:57 +0000 |
| commit | 3fbab82bd30158ccabc708a20419025923e08655 (patch) | |
| tree | 7c92eec3361a2cb2c2afe6b8777d1e8a722e2ac3 /src/effects/gradients | |
| parent | f4b6763b956fe85b1e20c40f5c5c23ebe36034c1 (diff) | |
Fixing deferred canvas bug caused by SkTwoPointConicalGradient declaring itself as opaque.
BUG=https://code.google.com/p/chromium/issues/detail?id=222140
TEST=DeferredCanvas unit test + DRT with --enable-deferred-2d-canvas
Author: junov@chromium.org
Reviewed By: bsalomon@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12879005
git-svn-id: http://skia.googlecode.com/svn/trunk@8247 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/gradients')
| -rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient.cpp | 6 | ||||
| -rw-r--r-- | src/effects/gradients/SkTwoPointConicalGradient.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index d3fb4dd435..38aa60cf7f 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -190,6 +190,12 @@ SkTwoPointConicalGradient::SkTwoPointConicalGradient( this->init(); } +bool SkTwoPointConicalGradient::isOpaque() const { + // Because areas outside the cone are left untouched, we cannot treat the + // shader as opaque even if the gradient itself is opaque. + return false; +} + void SkTwoPointConicalGradient::shadeSpan(int x, int y, SkPMColor* dstCParam, int count) { int toggle = init_dither_toggle(x, y); diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h index e02c390ab4..0807ae3201 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.h +++ b/src/effects/gradients/SkTwoPointConicalGradient.h @@ -62,6 +62,7 @@ public: TileMode* xy) const; virtual SkShader::GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; virtual GrEffectRef* asNewEffect(GrContext* context, const SkPaint& paint) const SK_OVERRIDE; + virtual bool isOpaque() const SK_OVERRIDE; SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); } SkScalar getStartRadius() const { return fRadius1; } |