http/tests/misc/acid3.html is flakey on Mavericks

https://bugs.webkit.org/show_bug.cgi?id=140253

Reviewed by Alexey Proskuryakov.

Source/WebCore:

CoreText has a bug <rdar://problem/19433490> in which kerning is not applied for a font
if a CTTypesetter is created using that font before a call to CTFontTransformGlyphs. We
often create typesetters in the complex code path, so it's not obvious when this bug
might present itself. This patch simply makes a dummy invocation of
CTFontTransformGlyphs() when creating a SimpleFontData.

No new tests because this is covered by http/tests/misc/acid3.html.

* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::platformInit):

LayoutTests:

Remove flakey mark.

* platform/mac/TestExpectations:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dc1407e7890e054f3e6a7fbca46480f877ad0584..918955297d9927f81a0e85161d6a4e15ee7a9f0a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2015-01-15  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        http/tests/misc/acid3.html is flakey on Mavericks
+        https://bugs.webkit.org/show_bug.cgi?id=140253
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove flakey mark.
+
+        * platform/mac/TestExpectations:
+
 2015-01-15  Andrzej Badowski  <a.badowski@samsung.com>
 
         AX: [ATK] Mark accessibility/render-counter-text.html as a suitable test for EFL and GTK.

diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 51111caa9f4dc2e5d4f937ff0131412c63efffb5..2cc09470f0b2fad8bf292f2a87e6674926924908 100644 (file)
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1483,7 +1483,7 @@ webkit.org/b/139968 [ MountainLion ] platform/mac/editing/spelling/autocorrectio
 # Fails on Mountain Lion and Yosemite on bots.
 webkit.org/b/139968 fast/text/atsui-rtl-override-selection.html [ Failure ]
 # These tests became flaky, text width gets slightly off.
-webkit.org/b/139968 [ Mavericks+ ] http/tests/misc/acid3.html [ Pass Failure ]
+webkit.org/b/139968 [ Yosemite+ ] http/tests/misc/acid3.html [ Pass Failure ]
 webkit.org/b/139968 [ Mavericks+ ] tables/mozilla/bugs/bug10633.html [ Pass Failure ]
 webkit.org/b/139968 [ Mavericks+ ] tables/mozilla/bugs/bug113235-1.html [ Pass Failure ]
 webkit.org/b/139968 [ Mavericks+ ] tables/mozilla/bugs/bug8858.html [ Pass Failure ]

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 32f15f976751d2cfc89b02c07c6c1497e9cda4d8..53e9c092745a96aca3532ebfb3e545cfe3b887e2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2015-01-15  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        http/tests/misc/acid3.html is flakey on Mavericks
+        https://bugs.webkit.org/show_bug.cgi?id=140253
+
+        Reviewed by Alexey Proskuryakov.
+
+        CoreText has a bug <rdar://problem/19433490> in which kerning is not applied for a font
+        if a CTTypesetter is created using that font before a call to CTFontTransformGlyphs. We
+        often create typesetters in the complex code path, so it's not obvious when this bug
+        might present itself. This patch simply makes a dummy invocation of
+        CTFontTransformGlyphs() when creating a SimpleFontData.
+
+        No new tests because this is covered by http/tests/misc/acid3.html.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::platformInit):
+
 2015-01-15  Chris Dumez  <cdumez@apple.com>
 
         Get rid of custom StyleBuilder code for 'line-height' CSS property

diff --git a/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index aeaeaac1a9f7f0eeece4596b23156088c802f35e..cca77bf46a7738fde82b9c75df73c45291f8ff03 100644 (file)
--- a/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -165,6 +165,13 @@ void SimpleFontData::platformInit()
         LOG_ERROR("failed to set up font, using system font %s", m_platformData.font());
         initFontData(this);
     }
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
+    // Work around <rdar://problem/19433490>
+    CGGlyph dummyGlyphs[] = {0, 0};
+    CGSize dummySize[] = {CGSizeMake(0, 0), CGSizeMake(0, 0)};
+    CTFontTransformGlyphs(m_platformData.ctFont(), dummyGlyphs, dummySize, 2, kCTFontTransformApplyPositioning | kCTFontTransformApplyShaping);
+#endif
     
     int iAscent;
     int iDescent;