Changeset 86667 in webkit

Timestamp:

May 17, 2011 4:36:55 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-05-17 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Support shadowed text in fast font path.
​https://bugs.webkit.org/show_bug.cgi?id=60462

• platform/graphics/Font.cpp: (WebCore::Font::drawText): Remove complex path shortcut for shadowed text.

• platform/graphics/qt/FontQt.cpp: (WebCore::Font::drawGlyphs): Paint shadows for simple text.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (2 diffs)
• platform/graphics/qt/FontQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-17  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Support shadowed text in fast font path.
+        https://bugs.webkit.org/show_bug.cgi?id=60462
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::drawText): Remove complex path shortcut for shadowed text.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::drawGlyphs): Paint shadows for simple text.
+
 2011-05-17  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/platform/graphics/Font.cpp

@@ -29 +29 @@
 #include "FontTranscoder.h"
 #if PLATFORM(QT) && HAVE(QRAWFONT)
-#include "ContextShadow.h"
 #include "GraphicsContext.h"
 #endif
@@ -147 +146 @@
 
 #if PLATFORM(QT) && HAVE(QRAWFONT)
-    if (context->textDrawingMode() & TextModeStroke || context->contextShadow()->m_type != ContextShadow::NoShadow)
+    if (context->textDrawingMode() & TextModeStroke)
         codePathToUse = Complex;
 #endif

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

@@ -340 +340 @@
     positions.reserve(numGlyphs);
 
-    float x = 0;
+    float width = 0;
 
     for (int i = 0; i < numGlyphs; ++i) {
@@ -348 +348 @@
             continue;
         glyphIndexes.append(glyph);
-        positions.append(QPointF(x, 0));
-        x += advance;
-    }
+        positions.append(QPointF(width, 0));
+        width += advance;
+    }
+
+    QRawFont rawFont(fontData->platformData().rawFont());
 
     QGlyphs qtGlyphs;
     qtGlyphs.setGlyphIndexes(glyphIndexes);
     qtGlyphs.setPositions(positions);
-    qtGlyphs.setFont(fontData->platformData().rawFont());
+    qtGlyphs.setFont(rawFont);
 
     QPainter* painter = context->platformContext();
+
+    ContextShadow* shadow = context->contextShadow();
+    switch (shadow->m_type) {
+    case ContextShadow::SolidShadow: {
+        QPen previousPen = painter->pen();
+        painter->setPen(shadow->m_color);
+        painter->translate(shadow->offset());
+        painter->drawGlyphs(point, qtGlyphs);
+        painter->translate(-shadow->offset());
+        painter->setPen(previousPen);
+        break;
+    }
+    case ContextShadow::BlurShadow: {
+        qreal height = rawFont.ascent() + rawFont.descent() + 1;
+        QRectF boundingRect(point.x(), point.y() - rawFont.ascent(), width, height);
+        QPainter* shadowPainter = shadow->beginShadowLayer(context, boundingRect);
+        if (shadowPainter) {
+            shadowPainter->setPen(shadow->m_color);
+            shadowPainter->drawGlyphs(point, qtGlyphs);
+            shadow->endShadowLayer(context);
+        }
+        break;
+    }
+    case ContextShadow::NoShadow:
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+        break;
+    }
 
     QPen previousPen = painter->pen();