Use ICU's emoji character properties

third_party/WebKit/Source/platform/fonts/CharacterEmoji.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/fonts/Character.h"
 
+#include <unicode/uchar.h>
+#include <unicode/uvernum.h>
+
+#if defined(USING_SYSTEM_ICU) && (U_ICU_VERSION_MAJOR_NUM <= 56)

[drott, 2016/04/05 19:40:40]

Can we avoid #ifdef and only keep the ICU property functions? I am slightly
worried about maintaining two sets of these properties. On which platforms are
we not controlling the ICU version?

 #include <unicode/uniset.h>
+#endif
 
 using namespace WTF;
 using namespace Unicode;
 
 namespace blink {
 
+// ICU 56 or earlier does not have API for Emoji properties,
+// but Chrome's copy of ICU 56 does.
+#if defined(USING_SYSTEM_ICU) && (U_ICU_VERSION_MAJOR_NUM <= 56)
 // The following UnicodeSet patterns were compiled from
 // http://www.unicode.org/Public/emoji/2.0//emoji-data.txt
 
-// FIXME crbug.com/579552:
-// These patterns should move to property group definitions in ICU.
-
 static const char kEmojiTextPattern[] =
     R"([[#][*][0-9][\u00A9][\u00AE][\u203C][\u2049][\u2122][\u2139])"
     R"([\u2194-\u2199][\u21A9-\u21AA][\u231A-\u231B][\u2328][\u23CF])"
     R"([\u23E9-\u23F3][\u23F8-\u23FA][\u24C2][\u25AA-\u25AB][\u25B6][\u25C0])"
     R"([\u25FB-\u25FE][\u2600-\u2604][\u260E][\u2611][\u2614-\u2615][\u2618])"
     R"([\u261D][\u2620][\u2622-\u2623][\u2626][\u262A][\u262E-\u262F])"
     R"([\u2638-\u263A][\u2648-\u2653][\u2660][\u2663][\u2665-\u2666][\u2668])"
     R"([\u267B][\u267F][\u2692-\u2694][\u2696-\u2697][\u2699][\u269B-\u269C])"
     R"([\u26A0-\u26A1][\u26AA-\u26AB][\u26B0-\u26B1][\u26BD-\u26BE])"
     R"([\u26C4-\u26C5][\u26C8][\u26CE-\u26CF][\u26D1][\u26D3-\u26D4])"
@@ skipping 63 matching lines @@
 }
 
 bool Character::isEmojiEmojiPresentation(UChar32 ch)
 {
     DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojiEmojiSet, ());
     if (emojiEmojiSet.isEmpty())
         applyPatternAndFreeze(&emojiEmojiSet, kEmojiEmojiPattern);
     return emojiEmojiSet.contains(ch);
 }
 
-
 bool Character::isEmojiModifierBase(UChar32 ch)
 {
     DEFINE_STATIC_LOCAL(icu::UnicodeSet, emojieModifierBaseSet, ());
     if (emojieModifierBaseSet.isEmpty())
         applyPatternAndFreeze(&emojieModifierBaseSet, kEmojiModifierBasePattern);
     return emojieModifierBaseSet.contains(ch);
 }
+#else
+bool Character::isEmojiTextPresentation(UChar32 ch)
+{
+    return u_hasBinaryProperty(ch, UCHAR_EMOJI)
+        && !u_hasBinaryProperty(ch, UCHAR_EMOJI_PRESENTATION);
+}
+
+bool Character::isEmojiEmojiPresentation(UChar32 ch)
+{
+    return u_hasBinaryProperty(ch, UCHAR_EMOJI_PRESENTATION);
+}
+
+bool Character::isEmojiModifierBase(UChar32 ch)
+{
+    return u_hasBinaryProperty(ch, UCHAR_EMOJI_MODIFIER_BASE);
+}
+#endif // defined(USING_SYSTEM_ICU) && (U_ICU_VERSION_MAJOR_NUM <= 56)
 
 bool Character::isEmojiKeycapBase(UChar32 ch)
 {
     return (ch >= '0' && ch <= '9') || ch == '#';
 }
 
 bool Character::isRegionalIndicator(UChar32 ch)
 {
     return (ch >= 0x1F1E6 && ch <= 0x1F1FF);
 }
 
 
 }; // namespace blink