Title: [89606] trunk/Source/WebCore
- Revision
- 89606
- Author
- [email protected]
- Date
- 2011-06-23 13:04:22 -0700 (Thu, 23 Jun 2011)
Log Message
2011-06-23 Andreas Kling <[email protected]>
Reviewed by Benjamin Poulain.
[Qt] Unbreak simple font fast-path after QRawFont API changes.
https://bugs.webkit.org/show_bug.cgi?id=63272
In the Qt 4.8 branch, the QGlyphs class has been renamed to
QGlyphRun, and some other small things have been tweaked.
* WebCore.pro:
* platform/graphics/qt/FontCacheQt.cpp:
(WebCore::rawFontForCharacters):
* platform/graphics/qt/FontQt.cpp:
(WebCore::Font::drawGlyphs):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89605 => 89606)
--- trunk/Source/WebCore/ChangeLog 2011-06-23 19:54:25 UTC (rev 89605)
+++ trunk/Source/WebCore/ChangeLog 2011-06-23 20:04:22 UTC (rev 89606)
@@ -1,3 +1,19 @@
+2011-06-23 Andreas Kling <[email protected]>
+
+ Reviewed by Benjamin Poulain.
+
+ [Qt] Unbreak simple font fast-path after QRawFont API changes.
+ https://bugs.webkit.org/show_bug.cgi?id=63272
+
+ In the Qt 4.8 branch, the QGlyphs class has been renamed to
+ QGlyphRun, and some other small things have been tweaked.
+
+ * WebCore.pro:
+ * platform/graphics/qt/FontCacheQt.cpp:
+ (WebCore::rawFontForCharacters):
+ * platform/graphics/qt/FontQt.cpp:
+ (WebCore::Font::drawGlyphs):
+
2011-06-23 Tony Chang <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp (89605 => 89606)
--- trunk/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp 2011-06-23 19:54:25 UTC (rev 89605)
+++ trunk/Source/WebCore/platform/graphics/qt/FontCacheQt.cpp 2011-06-23 20:04:22 UTC (rev 89606)
@@ -58,17 +58,17 @@
layout.createLine();
layout.endLayout();
- QList<QGlyphs> glyphList = layout.glyphs();
+ QList<QGlyphRun> glyphList = layout.glyphRuns();
ASSERT(glyphList.size() == 1);
- const QGlyphs& glyphs(glyphList.at(0));
+ const QGlyphRun& glyphs(glyphList.at(0));
QVector<quint32> glyphIndexes = glyphs.glyphIndexes();
if (glyphIndexes.isEmpty())
return QRawFont();
- return glyphs.font();
+ return glyphs.rawFont();
}
#endif
Modified: trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp (89605 => 89606)
--- trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp 2011-06-23 19:54:25 UTC (rev 89605)
+++ trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp 2011-06-23 20:04:22 UTC (rev 89606)
@@ -353,10 +353,10 @@
QRawFont rawFont(fontData->platformData().rawFont());
- QGlyphs qtGlyphs;
+ QGlyphRun qtGlyphs;
qtGlyphs.setGlyphIndexes(glyphIndexes);
qtGlyphs.setPositions(positions);
- qtGlyphs.setFont(rawFont);
+ qtGlyphs.setRawFont(rawFont);
QPainter* painter = context->platformContext();
@@ -366,7 +366,7 @@
QPen previousPen = painter->pen();
painter->setPen(shadow->m_color);
painter->translate(shadow->offset());
- painter->drawGlyphs(point, qtGlyphs);
+ painter->drawGlyphRun(point, qtGlyphs);
painter->translate(-shadow->offset());
painter->setPen(previousPen);
break;
@@ -377,7 +377,7 @@
QPainter* shadowPainter = shadow->beginShadowLayer(context, boundingRect);
if (shadowPainter) {
shadowPainter->setPen(shadow->m_color);
- shadowPainter->drawGlyphs(point, qtGlyphs);
+ shadowPainter->drawGlyphRun(point, qtGlyphs);
shadow->endShadowLayer(context);
}
break;
@@ -391,7 +391,7 @@
QPen previousPen = painter->pen();
painter->setPen(fillPenForContext(context));
- painter->drawGlyphs(point, qtGlyphs);
+ painter->drawGlyphRun(point, qtGlyphs);
painter->setPen(previousPen);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
