70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
From 41c7cbdead4d77254bf59397875dcc5cbb1e0a9d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
|
|
Date: Wed, 18 Sep 2013 10:42:53 +0200
|
|
Subject: [PATCH 7/9] Correct range used for Emoji checks.
|
|
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
|
|
---
|
|
Source/WebCore/ChangeLog | 19 +++++++++++++++++++
|
|
Source/WebCore/platform/graphics/Font.cpp | 2 +-
|
|
2 files changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
|
|
index 16d902c..75c29ab 100644
|
|
--- a/Source/WebCore/ChangeLog
|
|
+++ b/Source/WebCore/ChangeLog
|
|
@@ -1,3 +1,22 @@
|
|
+2013-09-17 Michael Brüning <michael.bruning@digia.com>
|
|
+
|
|
+ Correct range used for Emoji checks.
|
|
+ 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):
|
|
+
|
|
2013-08-19 Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
[Qt] QtWebKit (using the Arora browser) displays the border radii (radius) of a button very ugly
|
|
diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp
|
|
index fd3e414..e0963f6 100644
|
|
--- a/Source/WebCore/platform/graphics/Font.cpp
|
|
+++ b/Source/WebCore/platform/graphics/Font.cpp
|
|
@@ -616,7 +616,7 @@ bool Font::isCJKIdeographOrSymbol(UChar32 c)
|
|
return true;
|
|
|
|
// Emoji.
|
|
- if (c >= 0x1F200 && c <= 0x1F6F)
|
|
+ if (c >= 0x1F200 && c <= 0x1F6C5)
|
|
return true;
|
|
|
|
return isCJKIdeograph(c);
|
|
--
|
|
1.8.3.1
|
|
|