Title: [132802] trunk
- Revision
- 132802
- Author
- [email protected]
- Date
- 2012-10-29 07:47:34 -0700 (Mon, 29 Oct 2012)
Log Message
[Qt] Text with zero font size renders as X px sometimes, causing fast/text/zero-font-size-2.html to fail
https://bugs.webkit.org/show_bug.cgi?id=100115
Reviewed by Noam Rosenthal.
Source/WebCore:
* platform/graphics/qt/FontQt.cpp:
(WebCore::Font::drawGlyphs):
LayoutTests:
* platform/qt/TestExpectations: Unskip fast/text/zero-font-size-2.html.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (132801 => 132802)
--- trunk/LayoutTests/ChangeLog 2012-10-29 14:46:35 UTC (rev 132801)
+++ trunk/LayoutTests/ChangeLog 2012-10-29 14:47:34 UTC (rev 132802)
@@ -1,3 +1,12 @@
+2012-10-29 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Text with zero font size renders as X px sometimes, causing fast/text/zero-font-size-2.html to fail
+ https://bugs.webkit.org/show_bug.cgi?id=100115
+
+ Reviewed by Noam Rosenthal.
+
+ * platform/qt/TestExpectations: Unskip fast/text/zero-font-size-2.html.
+
2012-10-29 Raphael Kubo da Costa <[email protected]>
[EFL][WK2] REGRESSION(r132342): fast/events/frame-tab-focus.html fails
Modified: trunk/LayoutTests/platform/qt/TestExpectations (132801 => 132802)
--- trunk/LayoutTests/platform/qt/TestExpectations 2012-10-29 14:46:35 UTC (rev 132801)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2012-10-29 14:47:34 UTC (rev 132802)
@@ -2491,9 +2491,6 @@
webkit.org/b/99306 animations/opacity-transform-animation.html [ ImageOnlyFailure ]
webkit.org/b/99306 css3/filters/effect-blur-hw.html [ ImageOnlyFailure ] # Blur effect radius is too small on WebKit1, the effect not applied at all on WebKit2.
-# [Qt] Text with zero font size renders as X px sometimes, causing fast/text/zero-font-size-2.html to fail
-webkit.org/b/100115 fast/text/zero-font-size-2.html
-
# REGRESSION(r132143): It made fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html flakey
webkit.org/b/100117 fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html
Modified: trunk/Source/WebCore/ChangeLog (132801 => 132802)
--- trunk/Source/WebCore/ChangeLog 2012-10-29 14:46:35 UTC (rev 132801)
+++ trunk/Source/WebCore/ChangeLog 2012-10-29 14:47:34 UTC (rev 132802)
@@ -1,3 +1,13 @@
+2012-10-29 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Text with zero font size renders as X px sometimes, causing fast/text/zero-font-size-2.html to fail
+ https://bugs.webkit.org/show_bug.cgi?id=100115
+
+ Reviewed by Noam Rosenthal.
+
+ * platform/graphics/qt/FontQt.cpp:
+ (WebCore::Font::drawGlyphs):
+
2012-10-29 Huang Dongsung <[email protected]>
[TexMap] Make GraphicsLayerAnimation choose a proper timing function.
Modified: trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp (132801 => 132802)
--- trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp 2012-10-29 14:46:35 UTC (rev 132801)
+++ trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp 2012-10-29 14:47:34 UTC (rev 132802)
@@ -278,6 +278,9 @@
void Font::drawGlyphs(GraphicsContext* context, const SimpleFontData* fontData, const GlyphBuffer& glyphBuffer, int from, int numGlyphs, const FloatPoint& point) const
{
+ if (!fontData->platformData().size())
+ return;
+
if (context->paintingDisabled())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
