From 73259bc29230d186b45d14465f6e0280c1b7f739 Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Thu, 29 Sep 2011 23:12:02 +0000 Subject: [PATCH] Follow-up fix for Glyph variants (line final swashes) appear where they should not 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 --- LayoutTests/ChangeLog | 12 ++++++++++++ .../text/line-initial-and-final-swashes.html | 6 +++++- ...ine-initial-and-final-swashes-expected.png | Bin 18803 -> 20863 bytes ...ine-initial-and-final-swashes-expected.txt | 11 +++++++++-- Source/WebCore/ChangeLog | 9 +++++++++ .../graphics/cocoa/FontPlatformDataCocoa.mm | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 6b8df9723357..76ede634fef5 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,15 @@ +2011-09-29 Dan Bernstein + + Follow-up fix for 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 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 aa49e29fa0c6..89033a6d361b 100644 --- a/LayoutTests/fast/text/line-initial-and-final-swashes.html +++ b/LayoutTests/fast/text/line-initial-and-final-swashes.html @@ -1,7 +1,11 @@

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

v à e
v à e
+
+
v à e
+
v à e
+
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 GIT binary patch literal 20863 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 Hz4bo;-q4k4 literal 18803 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 U8%TdeY1O&EE}bemdE?&y0b|HLwEzGB 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 1910ef9f8dba..106fa7a5d3ed 100644 --- 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 5ae670b0f0db..9ce8dd3b8b4e 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2011-09-29 Dan Bernstein + + Follow-up fix for 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 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 906405b73922..7b136088343a 100644 --- 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 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(); -- 2.36.0