Changeset 62778 in webkit

Timestamp:

Jul 8, 2010 4:48:10 AM (14 years ago)

Author:

xji@chromium.org

Message:

2010-07-08 Xiaomei Ji <​xji@chromium.org>

Reviewed by David Levin.

Fix characters with unicode-bidi-mirror property are not correctly
mirrored in Linux.
​https://bugs.webkit.org/show_bug.cgi?id=41305

Since harfbuzz does not do mirroring, chromium should iterate each
character in the string and mirror it if needed before passing the
string to harfbuzz for shaping.

• fast/text/international/bidi-mirror-he-ar.html: Added.
• platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum: Added.
• platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png: Added.
• platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt: Added.

2010-07-08 Xiaomei Ji <​xji@chromium.org>

Reviewed by David Levin.

Fix characters with unicode-bidi-mirror property are not correctly
mirrored in Linux.
​https://bugs.webkit.org/show_bug.cgi?id=41305

Since harfbuzz does not do mirroring, chromium should iterate each
character in the string and mirror it if needed before passing the
string to harfbuzz for shaping.

Test: fast/text/international/bidi-mirror-he-ar.html

• platform/graphics/chromium/FontLinux.cpp: (WebCore::TextRunWalker::TextRunWalker): (WebCore::TextRunWalker::~TextRunWalker):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/international/bidi-mirror-he-ar.html (added)
• LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png (added)
• LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/FontLinux.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-08  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by David Levin.
+
+        Fix characters with unicode-bidi-mirror property are not correctly
+        mirrored in Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=41305
+
+        Since harfbuzz does not do mirroring, chromium should iterate each
+        character in the string and mirror it if needed before passing the
+        string to harfbuzz for shaping.
+
+        * fast/text/international/bidi-mirror-he-ar.html: Added.
+        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum: Added.
+        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png: Added.
+        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt: Added.
+
 2010-07-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-08  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by David Levin.
+
+        Fix characters with unicode-bidi-mirror property are not correctly
+        mirrored in Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=41305
+
+        Since harfbuzz does not do mirroring, chromium should iterate each
+        character in the string and mirror it if needed before passing the
+        string to harfbuzz for shaping.
+
+        Test: fast/text/international/bidi-mirror-he-ar.html
+
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::TextRunWalker::TextRunWalker):
+        (WebCore::TextRunWalker::~TextRunWalker):
+
 2010-07-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/platform/graphics/chromium/FontLinux.cpp

@@ -50 +50 @@
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/unicode/Unicode.h>
 
 namespace WebCore {
@@ -181 +182 @@
         m_item.font = allocHarfbuzzFont();
 
-        m_item.string = m_run.characters();
-        m_item.stringLength = m_run.length();
         m_item.item.bidiLevel = m_run.rtl();
+
+        int length = m_run.length();
+        m_item.stringLength = length;
+
+        if (!m_item.item.bidiLevel)
+            m_item.string = m_run.characters();
+        else {
+            // Assume mirrored character is in the same multilingual plane as the original one.
+            UChar* string = new UChar[length];
+            mirrorCharacters(string, m_run.characters(), length);
+            m_item.string = string;
+        }
 
         reset();
@@ -193 +204 @@
         deleteGlyphArrays();
         delete[] m_item.log_clusters;
+        if (m_item.item.bidiLevel)
+            delete[] m_item.string;
     }
 
@@ -456 +469 @@
     }
 
+    void mirrorCharacters(UChar* destination, const UChar* source, int length) const
+    {
+        int position = 0;
+        bool error;
+        // Iterate characters in source and mirror character if needed.
+        while (position < length) {
+            UChar32 character;
+            int nextPosition = position;
+            U16_NEXT(source, nextPosition, length, character);
+            character = u_charMirror(character);
+            U16_APPEND(destination, position, length, character, error);
+            ASSERT(!error);
+            position = nextPosition;
+        }
+    }
+
     const Font* const m_font;
     HB_ShaperItem m_item;