diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-05 18:04:27 -0700 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-05 18:04:27 -0700 |
commit | bc1daa50ef8440769220d18d403a8694ced77aac (patch) | |
tree | d584c600ae40dc22cd6fd43bdc4a19d5c2c1d9d6 /WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | |
parent | 6d1b48cf3ed27adf6c0c9b6552e667865d818abc (diff) | |
download | external_webkit-bc1daa50ef8440769220d18d403a8694ced77aac.zip external_webkit-bc1daa50ef8440769220d18d403a8694ced77aac.tar.gz external_webkit-bc1daa50ef8440769220d18d403a8694ced77aac.tar.bz2 |
Fix text-shadow style when blur is 0px
When blur is 0px , the should at least show up without any blurry.
http://b/issue?id=2581273
Change-Id: I3db26647c1ed3f7dd29e7045ae6f5c5b81722da6
Diffstat (limited to 'WebCore/platform/graphics/android/GraphicsContextAndroid.cpp')
-rw-r--r-- | WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index b76f5d5..5d38295 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -70,7 +70,7 @@ template <typename T> T* deepCopyPtr(const T* src) // Is Color premultiplied or not? If it is, then I can't blindly pass it to paint.setColor() struct ShadowRec { - SkScalar blur; // >0 means valid shadow + SkScalar blur; // >=0 means valid shadow SkScalar dx; SkScalar dy; SkColor color; @@ -149,13 +149,13 @@ public: bool setupShadowPaint(SkPaint* paint, SkPoint* offset) { - if (shadow.blur > 0) { + if (shadow.blur >= 0) { paint->setAntiAlias(true); paint->setDither(true); paint->setXfermodeMode(mode); paint->setColor(shadow.color); paint->setMaskFilter(SkBlurMaskFilter::Create(shadow.blur, - SkBlurMaskFilter::kNormal_BlurStyle))->unref(); + SkBlurMaskFilter::kNormal_BlurStyle))->safeUnref(); offset->set(shadow.dx, shadow.dy); return true; } @@ -253,7 +253,7 @@ public: paint->setAntiAlias(m_state->useAA); paint->setDither(true); paint->setXfermodeMode(m_state->mode); - if (m_state->shadow.blur > 0) { + if (m_state->shadow.blur >= 0) { SkDrawLooper* looper = new SkBlurDrawLooper(m_state->shadow.blur, m_state->shadow.dx, m_state->shadow.dy, @@ -944,9 +944,6 @@ void GraphicsContext::setPlatformShadow(const FloatSize& size, float blur, const if (paintingDisabled()) return; - if (blur <= 0) - this->clearPlatformShadow(); - SkColor c; if (color.isValid()) c = color.rgb(); |