Changeset 92005 in webkit

Timestamp:

Jul 29, 2011 1:20:52 PM (13 years ago)

Author:

mitz@apple.com

Message:

Source/WebCore: Added the regional indicator symbols to the set of codepoints that force use of the complex text code path.

Fixes <rdar://problem/9864578> Regional indicator symbols do not combine into national flags
​https://bugs.webkit.org/show_bug.cgi?id=65380

Reviewed by Anders Carlsson.

Test: fast/text/regional-indicator-symobls.html

• platform/graphics/Font.cpp:

(WebCore::Font::codePath): Added handling of surrogate pairs, which returns Complex for characters in
the range U+1F1E6..U+1F1FF.

LayoutTests: Test for <rdar://problem/9864578> Regional indicator symbols do not combine into national flags
​https://bugs.webkit.org/show_bug.cgi?id=65380

Reviewed by Anders Carlsson.

• fast/text/regional-indicator-symobls-expected.txt: Added.
• fast/text/regional-indicator-symobls.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/regional-indicator-symobls-expected.txt (added)
• LayoutTests/fast/text/regional-indicator-symobls.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/Font.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-29  Dan Bernstein  <mitz@apple.com>
+
+        Test for <rdar://problem/9864578> Regional indicator symbols do not combine into national flags
+        https://bugs.webkit.org/show_bug.cgi?id=65380
+
+        Reviewed by Anders Carlsson.
+
+        * fast/text/regional-indicator-symobls-expected.txt: Added.
+        * fast/text/regional-indicator-symobls.html: Added.
+
 2011-07-29  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-29  Dan Bernstein  <mitz@apple.com>
+
+        Added the regional indicator symbols to the set of codepoints that force use of the complex text code path.
+
+        Fixes <rdar://problem/9864578> Regional indicator symbols do not combine into national flags
+        https://bugs.webkit.org/show_bug.cgi?id=65380
+
+        Reviewed by Anders Carlsson.
+
+        Test: fast/text/regional-indicator-symobls.html
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::codePath): Added handling of surrogate pairs, which returns Complex for characters in
+        the range U+1F1E6..U+1F1FF.
+
 2011-07-28  David Hyatt  <hyatt@apple.com>
 

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

@@ -383 +383 @@
             return Complex;
 
+        if (c <= 0xDBFF) {
+            // High surrogate
+
+            if (i == run.length() - 1)
+                continue;
+
+            UChar next = run[++i];
+            if (!U16_IS_TRAIL(next))
+                continue;
+
+            UChar32 supplementaryCharacter = U16_GET_SUPPLEMENTARY(c, next);
+
+            if (supplementaryCharacter < 0x1F1E6) // U+1F1E6 through U+1F1FF Regional Indicator Symbols
+                continue;
+            if (supplementaryCharacter <= 0x1F1FF)
+                return Complex;
+
+            // FIXME: Check for Brahmi (U+11000 block), Kaithi (U+11080 block) and other complex scripts
+            // in plane 1 or higher.
+
+            continue;
+        }
+
         if (c < 0xFE20) // U+FE20 through U+FE2F Combining half marks
             continue;
         if (c <= 0xFE2F)
             return Complex;
-
-        // FIXME: Make this loop UTF-16-aware and check for Brahmi (U+11000 block)
-        // Kaithi (U+11080 block) and other complex scripts in plane 1 or higher.
     }