Changeset 102190 in webkit

Timestamp:

Dec 6, 2011, 4:38:35 PM (15 years ago)

Author:

bashi@chromium.org

Message:

[Chromium] unknown characters symbol on \n in complex script text (RTL and LTR)
​https://bugs.webkit.org/show_bug.cgi?id=73806

Reviewed by Tony Chang.

Source/WebCore:

Sets fMergeNeutralItems to 1 instead of merging script items based on their tags.

Tests: platform/chromium/fast/text/international/chromium-complex-text-non-printable-expected.html

platform/chromium/fast/text/international/chromium-complex-text-non-printable.html

• platform/graphics/chromium/UniscribeHelper.cpp:

(WebCore::UniscribeHelper::fillRuns): Removed a block which merges script items.

LayoutTests:

Adds a test to ensure the missing glyph doesn't appear on LF in complex text.

• fast/text/international/chromium-complex-text-non-printable-expected.html: Added.
• fast/text/international/chromium-complex-text-non-printable.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/international/chromium-complex-text-non-printable-expected.html (added)
• LayoutTests/fast/text/international/chromium-complex-text-non-printable.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/UniscribeHelper.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-06  Kenichi Ishibashi  <bashi@chromium.org>
+
+        [Chromium] unknown characters symbol on \n in complex script text (RTL and LTR)
+        https://bugs.webkit.org/show_bug.cgi?id=73806
+
+        Reviewed by Tony Chang.
+
+        Adds a test to ensure the missing glyph doesn't appear on LF in complex text.
+
+        * fast/text/international/chromium-complex-text-non-printable-expected.html: Added.
+        * fast/text/international/chromium-complex-text-non-printable.html: Added.
+
 2011-12-06  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-06  Kenichi Ishibashi  <bashi@chromium.org>
+
+        [Chromium] unknown characters symbol on \n in complex script text (RTL and LTR)
+        https://bugs.webkit.org/show_bug.cgi?id=73806
+
+        Reviewed by Tony Chang.
+
+        Sets fMergeNeutralItems to 1 instead of merging script items based on their tags.
+
+        Tests: platform/chromium/fast/text/international/chromium-complex-text-non-printable-expected.html
+               platform/chromium/fast/text/international/chromium-complex-text-non-printable.html
+
+        * platform/graphics/chromium/UniscribeHelper.cpp:
+        (WebCore::UniscribeHelper::fillRuns): Removed a block which merges script items.
+
 2011-12-06  Luke Macpherson   <macpherson@chromium.org>
 

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

@@ -541 +541 @@
                                            0, // fNumericOverride    :1;
                                            0, // fLegacyBidiClass    :1;
-                                           0, // fMergeNeutralItems  :1;
+                                           1, // fMergeNeutralItems  :1;
                                            0};// fReserved           :7;
     // Calling ScriptApplyDigitSubstitution( 0, &inputControl, &inputState)
@@ -575 +575 @@
                                             &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,