Changeset 114187 in webkit

Timestamp:

Apr 13, 2012, 5:33:09 PM (13 years ago)

Author:

xji@chromium.org

Message:

REGRESSION(r102190) [chromium] text rendering (font and font size) in some Arabic/Persian page is wrong
when using certain fonts
​https://bugs.webkit.org/show_bug.cgi?id=83523

Reviewed by Kent Tamura.

Revert r102190.
Convert characters being treatAsSpace to white space.

• platform/graphics/chromium/UniscribeHelper.cpp:

(WebCore::UniscribeHelper::fillRuns):
(WebCore::UniscribeHelper::adjustSpaceAdvances):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/UniscribeHelper.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-13  Xiaomei Ji  <xji@chromium.org>
+
+        REGRESSION(r102190) [chromium] text rendering (font and font size) in some Arabic/Persian page is wrong
+        when using certain fonts
+        https://bugs.webkit.org/show_bug.cgi?id=83523
+
+        Reviewed by Kent Tamura.
+
+        Revert r102190.
+        Convert characters being treatAsSpace to white space. 
+
+        * platform/graphics/chromium/UniscribeHelper.cpp:
+        (WebCore::UniscribeHelper::fillRuns):
+        (WebCore::UniscribeHelper::adjustSpaceAdvances):
+
 2012-04-13  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/UniscribeHelper.cpp

@@ -542 +542 @@
                                            0, // fNumericOverride    :1;
                                            0, // fLegacyBidiClass    :1;
-                                           1, // fMergeNeutralItems  :1;
+                                           0, // fMergeNeutralItems  :1;
                                            0};// fReserved           :7;
     // Calling ScriptApplyDigitSubstitution( 0, &inputControl, &inputState)
@@ -576 +576 @@
                                             &m_runs[0], &m_scriptTags[0],
                                             &numberOfItems);
+
+            if (SUCCEEDED(hr)) { 
+                // Pack consecutive runs, the script tag of which are 
+                // SCRIPT_TAG_UNKNOWN, to reduce the number of runs. 
+                for (int i = 0; i < numberOfItems; ++i) { 
+                    if (m_scriptTags[i] == SCRIPT_TAG_UNKNOWN) { 
+                        int j = 1; 
+                        while (i + j < numberOfItems && m_scriptTags[i + j] == SCRIPT_TAG_UNKNOWN) 
+                            ++j; 
+                        if (--j) { 
+                            m_runs.remove(i + 1, j); 
+                            m_scriptTags.remove(i + 1, j); 
+                            numberOfItems -= j; 
+                        } 
+                    } 
+                } 
+                m_scriptTags.resize(numberOfItems); 
+            } 
         } else {
             hr = ScriptItemize(m_input, m_inputLength,
@@ -893 +911 @@
             int currentAdvance = shaping.m_advance[glyphIndex];
 
+            shaping.m_glyphs[glyphIndex] = shaping.m_spaceGlyph;
+
             if (treatAsSpace) {
                 // currentAdvance does not include additional letter-spacing,
@@ -914 +934 @@
             shaping.m_offsets[glyphIndex].du = 0;
             shaping.m_offsets[glyphIndex].dv = 0;
-            shaping.m_glyphs[glyphIndex] = shaping.m_spaceGlyph;
         }
     }