Changeset 124654 in webkit

Timestamp:

Aug 3, 2012 2:30:06 PM (12 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore: <rdar://problem/12005188> REGRESSION (Safari 5.1 - 6): Cannot correctly display Traditional Mongolian Script
​https://bugs.webkit.org/show_bug.cgi?id=92864

Reviewed by Sam Weinig.

Test: platform/mac/fast/text/combining-character-sequence-vertical.html

• platform/graphics/SimpleFontData.cpp:

(WebCore::SimpleFontData::glyphForCharacter): Added this helper function.

• platform/graphics/SimpleFontData.h:

(SimpleFontData): Declared glyphDataForCharacter.

• platform/graphics/mac/FontComplexTextMac.cpp:

(WebCore::Font::fontDataForCombiningCharacterSequence): Added logic to use the appropriate
variant of each font in the fallback list, which mimcs the equivalent logic in
glyphDataAndPageForCharacter().

LayoutTests: REGRESSION (Safari 5.1 - 6): Cannot correctly display Traditional Mongolian Script
​https://bugs.webkit.org/show_bug.cgi?id=92864

Reviewed by Sam Weinig.

• platform/mac/fast/text/combining-character-sequence-vertical-expected.html: Added.
• platform/mac/fast/text/combining-character-sequence-vertical.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/combining-character-sequence-vertical-expected.html (added)
• LayoutTests/platform/mac/fast/text/combining-character-sequence-vertical.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/SimpleFontData.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/SimpleFontData.h (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-03  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION (Safari 5.1 - 6): Cannot correctly display Traditional Mongolian Script
+        https://bugs.webkit.org/show_bug.cgi?id=92864
+
+        Reviewed by Sam Weinig.
+
+        * platform/mac/fast/text/combining-character-sequence-vertical-expected.html: Added.
+        * platform/mac/fast/text/combining-character-sequence-vertical.html: Added.
+
 2012-08-03  Dmitry Titov  <dimich@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-03  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/12005188> REGRESSION (Safari 5.1 - 6): Cannot correctly display Traditional Mongolian Script
+        https://bugs.webkit.org/show_bug.cgi?id=92864
+
+        Reviewed by Sam Weinig.
+
+        Test: platform/mac/fast/text/combining-character-sequence-vertical.html
+
+        * platform/graphics/SimpleFontData.cpp:
+        (WebCore::SimpleFontData::glyphForCharacter): Added this helper function.
+        * platform/graphics/SimpleFontData.h:
+        (SimpleFontData): Declared glyphDataForCharacter.
+        * platform/graphics/mac/FontComplexTextMac.cpp:
+        (WebCore::Font::fontDataForCombiningCharacterSequence): Added logic to use the appropriate
+        variant of each font in the fallback list, which mimcs the equivalent logic in
+        glyphDataAndPageForCharacter().
+
 2012-08-03  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp

@@ -149 +149 @@
 }
 
+Glyph SimpleFontData::glyphForCharacter(UChar32 character) const
+{
+    GlyphPageTreeNode* node = GlyphPageTreeNode::getRootChild(this, character / GlyphPage::size);
+    return node->page() ? node->page()->glyphAt(character % GlyphPage::size) : 0;
+}
+
 bool SimpleFontData::isSegmented() const
 {

trunk/Source/WebCore/platform/graphics/SimpleFontData.h

@@ -154 +154 @@
     virtual bool containsCharacters(const UChar*, int length) const;
 
+    Glyph glyphForCharacter(UChar32) const;
+
     void determinePitch();
     Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }

trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp

@@ -186 +186 @@
     for (const FontData* fontData = fontDataAt(0); fontData; fontData = fontDataAt(++i)) {
         const SimpleFontData* simpleFontData = fontData->fontDataForCharacter(baseCharacter);
-        if (variant != NormalVariant) {
+        if (variant == NormalVariant) {
+            if (simpleFontData->platformData().orientation() == Vertical) {
+                if (isCJKIdeographOrSymbol(baseCharacter) && !simpleFontData->hasVerticalGlyphs()) {
+                    variant = BrokenIdeographVariant;
+                    simpleFontData = simpleFontData->brokenIdeographFontData();
+                } else if (m_fontDescription.textOrientation() == TextOrientationVerticalRight) {
+                    SimpleFontData* verticalRightFontData = simpleFontData->verticalRightOrientationFontData();
+                    Glyph verticalRightGlyph = verticalRightFontData->glyphForCharacter(baseCharacter);
+                    if (verticalRightGlyph == baseCharacterGlyphData.glyph)
+                        simpleFontData = verticalRightFontData;
+                } else {
+                    SimpleFontData* uprightFontData = simpleFontData->uprightOrientationFontData();
+                    Glyph uprightGlyph = uprightFontData->glyphForCharacter(baseCharacter);
+                    if (uprightGlyph != baseCharacterGlyphData.glyph)
+                        simpleFontData = uprightFontData;
+                }
+            }
+        } else {
             if (const SimpleFontData* variantFontData = simpleFontData->variantFontData(m_fontDescription, variant))
                 simpleFontData = variantFontData;