Changeset 65876 in webkit

Timestamp:

Aug 24, 2010 1:38:35 AM (14 years ago)

Author:

ariya@webkit.org

Message:

[Qt] Support text-shadow blur
​https://bugs.webkit.org/show_bug.cgi?id=19728

Patch by Ariya Hidayat <​ariya@sencha.com> on 2010-08-24
Reviewed by Kenneth Rohde Christiansen.

Implement blur for text shadow using the shadow layer in r65782.

• platform/graphics/qt/ContextShadow.cpp:

(WebCore::ContextShadow::beginShadowLayer):

• platform/graphics/qt/FontQt.cpp:

(WebCore::drawTextCommon):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ContextShadow.cpp (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Ariya Hidayat  <ariya@sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Support text-shadow blur
+        https://bugs.webkit.org/show_bug.cgi?id=19728
+
+        Implement blur for text shadow using the shadow layer in r65782.
+
+        * platform/graphics/qt/ContextShadow.cpp:
+        (WebCore::ContextShadow::beginShadowLayer):
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::drawTextCommon):
+
 2010-08-23  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/platform/graphics/qt/ContextShadow.cpp

@@ -315 +315 @@
     m_layerPainter = new QPainter;
     m_layerPainter->begin(&m_layerImage);
+    m_layerPainter->setFont(p->font());
     m_layerPainter->translate(offset);
 

trunk/WebCore/platform/graphics/qt/FontQt.cpp

@@ -24 +24 @@
 
 #include "AffineTransform.h"
+#include "ContextShadow.h"
 #include "FontDescription.h"
 #include "FontFallbackList.h"
@@ -109 +110 @@
     QPointF pt(point.x(), point.y());
 
-    // text shadow
-    FloatSize shadowSize;
-    float shadowBlur;
-    Color shadowColor;
-    bool hasShadow = ctx->textDrawingMode() == cTextFill && ctx->getShadow(shadowSize, shadowBlur, shadowColor);
-
     if (from > 0 || to < run.length()) {
         if (isComplexText) {
@@ -126 +121 @@
             QFontMetrics fm(font);
             int ascent = fm.ascent();
-            QRectF clip(point.x() + x1, point.y() - ascent, x2 - x1, fm.height());
-
-            if (hasShadow) {
-                // TODO: when blur support is added, the clip will need to account
-                // for the blur radius
+            QRectF boundingRect(point.x() + x1, point.y() - ascent, x2 - x1, fm.height());
+            QRectF clip = boundingRect;
+
+            ContextShadow* ctxShadow = ctx->contextShadow();
+
+            if (ctxShadow->type != ContextShadow::NoShadow) {
                 qreal dx1 = 0, dx2 = 0, dy1 = 0, dy2 = 0;
-                if (shadowSize.width() > 0)
-                    dx2 = shadowSize.width();
+                if (ctxShadow->offset.x() > 0)
+                    dx2 = ctxShadow->offset.x();
                 else
-                    dx1 = -shadowSize.width();
-                if (shadowSize.height() > 0)
-                    dy2 = shadowSize.height();
+                    dx1 = -ctxShadow->offset.x();
+                if (ctxShadow->offset.y() > 0)
+                    dy2 = ctxShadow->offset.y();
                 else
-                    dy1 = -shadowSize.height();
+                    dy1 = -ctxShadow->offset.y();
                 // expand the clip rect to include the text shadow as well
                 clip.adjust(dx1, dx2, dy1, dy2);
+                clip.adjust(-ctxShadow->blurRadius, -ctxShadow->blurRadius, ctxShadow->blurRadius, ctxShadow->blurRadius);
             }
             p->save();
             p->setClipRect(clip.toRect(), Qt::IntersectClip);
             pt.setY(pt.y() - ascent);
-            if (hasShadow) {
-                p->save();
-                p->setPen(QColor(shadowColor));
-                p->translate(shadowSize.width(), shadowSize.height());
-                line.draw(p, pt);
-                p->restore();
+
+            if (ctxShadow->type != ContextShadow::NoShadow) {
+                ContextShadow* ctxShadow = ctx->contextShadow();
+                if (ctxShadow->type != ContextShadow::BlurShadow) {
+                    p->save();
+                    p->setPen(ctxShadow->color);
+                    p->translate(ctxShadow->offset);
+                    line.draw(p, pt);
+                    p->restore();
+                } else {
+                    QPainter* shadowPainter = ctxShadow->beginShadowLayer(p, boundingRect);
+                    if (shadowPainter) {
+                        // Since it will be blurred anyway, we don't care about render hints.
+                        shadowPainter->setPen(ctxShadow->color);
+                        line.draw(shadowPainter, pt);
+                        ctxShadow->endShadowLayer(p);
+                    }
+                }
             }
             p->setPen(textFillPen);
@@ -173 +182 @@
         flags |= Qt::TextBypassShaping;
 #endif
-    if (hasShadow) {
-        // TODO: text shadow blur support
-        p->save();
-        p->setPen(QColor(shadowColor));
-        p->translate(shadowSize.width(), shadowSize.height());
-        p->drawText(pt, string, flags, run.padding());
-        p->restore();
+    if (ctx->contextShadow()->type != ContextShadow::NoShadow) {
+        ContextShadow* ctxShadow = ctx->contextShadow();
+        if (ctxShadow->type != ContextShadow::BlurShadow) {
+            p->save();
+            p->setPen(ctxShadow->color);
+            p->translate(ctxShadow->offset);
+            p->drawText(pt, string, flags, run.padding());
+            p->restore();
+        } else {
+            QFontMetrics fm(font);
+            QRectF boundingRect(point.x(), point.y() - fm.ascent(), fm.width(string), fm.height());
+            QPainter* shadowPainter = ctxShadow->beginShadowLayer(p, boundingRect);
+            if (shadowPainter) {
+                // Since it will be blurred anyway, we don't care about render hints.
+                shadowPainter->setFont(p->font());
+                shadowPainter->setPen(ctxShadow->color);
+                shadowPainter->drawText(pt, string, flags, run.padding());
+                ctxShadow->endShadowLayer(p);
+            }
+        }
     }
     if (ctx->textDrawingMode() & cTextStroke) {