<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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dd55fcbf3263bfb207d61502a5521634e7b25000..e4f0d1a9af1a9028f603e45795d2a257306cd51d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-30  Dan Bernstein  <mitz@apple.com>
+
+        <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  <beidson@apple.com>
 
         Fix typo in test name from my last commit.

diff --git a/LayoutTests/platform/mac-lion/Skipped b/LayoutTests/platform/mac-lion/Skipped
index 9d23cb474ffb5fdb50ed41bd808b1f1c28981d75..2d2f442e138cb74f93eb8c36cbec505cee6d6e5b 100644 (file)
--- a/LayoutTests/platform/mac-lion/Skipped
+++ b/LayoutTests/platform/mac-lion/Skipped
@@ -121,10 +121,6 @@ svg/W3C-SVG-1.1-SE/types-dom-01-b.svg
 
 # --- 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
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 12782ec8e694a1f74012a5d0e1561eeb42c79d6b..6a9e4f582917bab91467784c6141661d2d094703 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-30  Dan Bernstein  <mitz@apple.com>
+
+        <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  <chutten@rim.com>
 
         BlackBerry - Support Proxy-Authenticate headers when a proxy is configured

diff --git a/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp b/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
index d07f4dc17d99e7b7306153a1fd0c747844c933d2..5aa23d38f31defa0cde8990b3af5a93934ffdaef 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
+++ b/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp
@@ -64,7 +64,8 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
                 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);