Follow-up fix for <rdar://problem/10191243> Glyph variants (line final swashes) appea...

Reviewed by Simon Fraser.

Source/WebCore:

* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::ctFont): Check for Hoefler Text Black Italic as well.

LayoutTests:

Added Hoefler Text Black Italic to the test case.

* fast/text/line-initial-and-final-swashes.html:
* platform/mac/fast/text/line-initial-and-final-swashes-expected.png:
* platform/mac/fast/text/line-initial-and-final-swashes-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6b8df9723357824e99a227d19c93cd216f1258c9..76ede634fef50c00a9d966ba27c1b99c69f51cca 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-29  Dan Bernstein  <mitz@apple.com>
+
+        Follow-up fix for <rdar://problem/10191243> Glyph variants (line final swashes) appear where they should not
+
+        Reviewed by Simon Fraser.
+
+        Added Hoefler Text Black Italic to the test case.
+
+        * fast/text/line-initial-and-final-swashes.html:
+        * platform/mac/fast/text/line-initial-and-final-swashes-expected.png:
+        * platform/mac/fast/text/line-initial-and-final-swashes-expected.txt:
+
 2011-09-29  Adam Barth  <abarth@webkit.org>
 
         This test can also time out.

diff --git a/LayoutTests/fast/text/line-initial-and-final-swashes.html b/LayoutTests/fast/text/line-initial-and-final-swashes.html
index aa49e29fa0c6151d73efa5895d618572b906239f..89033a6d361bc1561bd371768109ab7055aadc09 100644 (file)
--- a/LayoutTests/fast/text/line-initial-and-final-swashes.html
+++ b/LayoutTests/fast/text/line-initial-and-final-swashes.html
@@ -1,7 +1,11 @@
 <p>
-    The blue text should be identical to, and overlap, the red text, so there should be no red pixels below.
+    The black text should be identical to, and overlap, the red text, so there should be no red pixels below.
 </p>
 <div style="font-size: 144px; font-family: Hoefler Text; font-style: italic; -webkit-font-smoothing: none;">
     <div style="color: red;">v a&#x0300; e</div>
     <div style="margin-top: -144px;">v &#xe0; e</div>
 </div>
+<div style="font-size: 144px; font-family: Hoefler Text; font-style: italic; font-weight: bold; -webkit-font-smoothing: none;">
+    <div style="color: red;">v a&#x0300; e</div>
+    <div style="margin-top: -144px;">v &#xe0; e</div>
+</div>

diff --git a/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.png b/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.png
index bcf3cea3a864347417d5c13eebc70dd4558f5650..9ec706bd8ea34e2a7065589de997a457b936c56a 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.png and b/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.txt b/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.txt
index 1910ef9f8dba2b76dfbeb53e02cf50c72aa84e07..106fa7a5d3edf9cf8335f54d279693a114d5d4dc 100644 (file)
--- a/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/line-initial-and-final-swashes-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 635x18
-          text run at (0,0) width 635: "The blue text should be identical to, and overlap, the red text, so there should be no red pixels below."
+        RenderText {#text} at (0,0) size 642x18
+          text run at (0,0) width 642: "The black text should be identical to, and overlap, the red text, so there should be no red pixels below."
       RenderBlock {DIV} at (0,34) size 784x144
         RenderBlock {DIV} at (0,0) size 784x144 [color=#FF0000]
           RenderText {#text} at (0,0) size 256x144
@@ -13,3 +13,10 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x144
           RenderText {#text} at (0,0) size 256x144
             text run at (0,0) width 256: "v \x{E0} e"
+      RenderBlock {DIV} at (0,178) size 784x144
+        RenderBlock {DIV} at (0,0) size 784x144 [color=#FF0000]
+          RenderText {#text} at (0,0) size 293x144
+            text run at (0,0) width 293: "v a\x{300} e"
+        RenderBlock {DIV} at (0,0) size 784x144
+          RenderText {#text} at (0,0) size 293x144
+            text run at (0,0) width 293: "v \x{E0} e"

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5ae670b0f0db580851f60e787a84a8ec5a3c9ed2..9ce8dd3b8b4eebfe03ad1198b1e2049468f6535a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-29  Dan Bernstein  <mitz@apple.com>
+
+        Follow-up fix for <rdar://problem/10191243> Glyph variants (line final swashes) appear where they should not
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::FontPlatformData::ctFont): Check for Hoefler Text Black Italic as well.
+
 2011-09-29  Cary Clark  <caryclark@google.com>
 
         Enable LCD text in Skia on Mac

diff --git a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
index 906405b7392222e151b0b2743f0c5f8e480d8617..7b136088343ae084e2e4ae407bbe089ad867c474 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
@@ -252,7 +252,7 @@ CTFontRef FontPlatformData::ctFont() const
         CTFontDescriptorRef fontDescriptor;
         RetainPtr<CFStringRef> postScriptName(AdoptCF, CTFontCopyPostScriptName(m_CTFont.get()));
         // Hoefler Text Italic has line-initial and -final swashes enabled by default, so disable them.
-        if (CFEqual(postScriptName.get(), CFSTR("HoeflerText-Italic")))
+        if (CFEqual(postScriptName.get(), CFSTR("HoeflerText-Italic")) || CFEqual(postScriptName.get(), CFSTR("HoeflerText-BlackItalic")))
             fontDescriptor = cascadeToLastResortAndDisableSwashesFontDescriptor();
         else
             fontDescriptor = cascadeToLastResortFontDescriptor();