Title: [106310] trunk
- Revision
- 106310
- Author
- [email protected]
- Date
- 2012-01-30 17:57:37 -0800 (Mon, 30 Jan 2012)
Log Message
<rdar://problem/10778045> REGRESSION (r91935): text-combine fails
https://bugs.webkit.org/show_bug.cgi?id=77373
Reviewed by Darin Adler.
Source/WebCore:
Removed tests that were failing because of this bug from the Lion skipped
list.
* platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
(WebCore::GlyphPage::fill): Changed to use CTFontGetGlyphsForCharacters,
rather than wkGetVerticalGlyphsForCharacters, for non-fullwidth fonts.
LayoutTests:
Removed tests that were failing because of this bug from the skipped list.
* platform/mac-lion/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (106309 => 106310)
--- trunk/LayoutTests/ChangeLog 2012-01-31 01:36:46 UTC (rev 106309)
+++ trunk/LayoutTests/ChangeLog 2012-01-31 01:57:37 UTC (rev 106310)
@@ -1,3 +1,14 @@
+2012-01-30 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10778045> REGRESSION (r91935): text-combine fails
+ https://bugs.webkit.org/show_bug.cgi?id=77373
+
+ Reviewed by Darin Adler.
+
+ Removed tests that were failing because of this bug from the skipped list.
+
+ * platform/mac-lion/Skipped:
+
2012-01-30 Brady Eidson <[email protected]>
Fix typo in test name from my last commit.
Modified: trunk/LayoutTests/platform/mac-lion/Skipped (106309 => 106310)
--- trunk/LayoutTests/platform/mac-lion/Skipped 2012-01-31 01:36:46 UTC (rev 106309)
+++ trunk/LayoutTests/platform/mac-lion/Skipped 2012-01-31 01:57:37 UTC (rev 106310)
@@ -121,10 +121,6 @@
# --- Misc failures that need investigation ---
-# These fail in DRT but look correct in Safari.
-fast/text/emphasis-combined-text.html
-fast/text/international/text-combine-image-test.html
-
# Sending the mouse down event to the scrollbar starts a nested run loop which causes a hang.
fast/events/mousedown-in-subframe-scrollbar.html
Modified: trunk/Source/WebCore/ChangeLog (106309 => 106310)
--- trunk/Source/WebCore/ChangeLog 2012-01-31 01:36:46 UTC (rev 106309)
+++ trunk/Source/WebCore/ChangeLog 2012-01-31 01:57:37 UTC (rev 106310)
@@ -1,3 +1,17 @@
+2012-01-30 Dan Bernstein <[email protected]>
+
+ <rdar://problem/10778045> REGRESSION (r91935): text-combine fails
+ https://bugs.webkit.org/show_bug.cgi?id=77373
+
+ Reviewed by Darin Adler.
+
+ Removed tests that were failing because of this bug from the Lion skipped
+ list.
+
+ * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+ (WebCore::GlyphPage::fill): Changed to use CTFontGetGlyphsForCharacters,
+ rather than wkGetVerticalGlyphsForCharacters, for non-fullwidth fonts.
+
2012-01-30 Christopher Hutten-Czapski <[email protected]>
BlackBerry - Support Proxy-Authenticate headers when a proxy is configured
Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp (106309 => 106310)
--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2012-01-31 01:36:46 UTC (rev 106309)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2012-01-31 01:57:37 UTC (rev 106310)
@@ -64,7 +64,8 @@
haveGlyphs = true;
}
}
- } else if (wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)) {
+ } else if ((fontData->platformData().widthVariant() == RegularWidth) ? wkGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)
+ : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)) {
for (unsigned i = 0; i < length; ++i) {
if (!glyphs[i])
setGlyphDataForIndex(offset + i, 0, 0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
