Correct range used for Emoji checks.old/5.1

https://bugs.webkit.org/show_bug.cgi?id=121486

Reviewed by Allan Sandfeld Jensen.

Found and reported by David Binderman via Qt bug tracker.

The check if a character was in the Emoji range always evaluated to
false due to the upper range limit being lower than the lower limit.

Changed the upper limit to the highest assigned character from the
"Transport and Map Symbols" (0x1F6C5) as that seems to have been the
intended upper range limit of this check.

* platform/graphics/Font.cpp:
(WebCore::Font::isCJKIdeographOrSymbol):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155951 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: Ie62aceb17bba170b0191ba64434e17d445cf7779
Task-number: QTBUG-33206
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 16 insertions, 1 deletions

diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp
index 42dd14a6b..83a800d9b 100644
--- a/Source/WebCore/platform/graphics/Font.cpp
+++ b/Source/WebCore/platform/graphics/Font.cpp
@@ -595,7 +595,22 @@ bool Font::isCJKIdeographOrSymbol(UChar32 c)
         return true;
 
     // Emoji.
-    if (c >= 0x1F200 && c <= 0x1F6F)
+    if (c == 0x1F100)
+        return true;
+
+    if (c >= 0x1F110 && c <= 0x1F129)
+        return true;
+
+    if (c >= 0x1F130 && c <= 0x1F149)
+        return true;
+
+    if (c >= 0x1F150 && c <= 0x1F169)
+        return true;
+
+    if (c >= 0x1F170 && c <= 0x1F189)
+        return true;
+
+    if (c >= 0x1F200 && c <= 0x1F6C5)
         return true;
 
     return isCJKIdeograph(c);