From 35eccae0b7870c531ab56dfee7002108c95d908c Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Wed, 10 Nov 2010 22:05:43 -0800 Subject: Revert "Merge "Fix text-shadow style when blur is 0px"" Bug: 3185661 This reverts commit ccbb8a238ca0ba5fc0780884e281e6b6a601a675, reversing changes made to fcb462de639304deaa2da761823fbfeef88b36d4. --- WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'WebCore/platform/graphics/android/GraphicsContextAndroid.cpp') diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index 5d38295..b76f5d5 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -70,7 +70,7 @@ template 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))->safeUnref(); + SkBlurMaskFilter::kNormal_BlurStyle))->unref(); 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,6 +944,9 @@ 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(); -- cgit v1.1