Reviewed by Dan.

Add new helper function isArabicChar - SVG Fonts support needs it.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0527cf50eddf195dd797fb607f15502e3e3661ff..1bb373ea0f73e107ce896b5c003b41ab3c85ff9b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-06  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Dan.
+
+        Add new helper function isArabicChar - SVG Fonts support needs it.
+
+        * wtf/unicode/icu/UnicodeIcu.h:
+        (WTF::Unicode::isArabicChar):
+        * wtf/unicode/qt4/UnicodeQt4.h:
+        (WTF::Unicode::isArabicChar):
+
 2008-01-06  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.

diff --git a/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h b/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h
index 3ff84946f8fac9568119df61c132ad1ea3fd70d7..cc9ab8c1a754a2dcbe3b24cbb3f0ba5ec36308c8 100644 (file)
--- a/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h
+++ b/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h
@@ -162,6 +162,11 @@ namespace WTF {
       return u_totitle(c);
     }
 
+    inline bool isArabicChar(UChar32 c)
+    {
+        return ublock_getCode(c) == UBLOCK_ARABIC;
+    }
+
     inline bool isFormatChar(UChar32 c)
     {
       return u_charType(c) == U_FORMAT_CHAR;

diff --git a/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h b/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
index ec57dfde890a3808f660b2e096ebe91623a11ffd..0fbd869f55931edc787969e71c92085b2584f848 100644 (file)
--- a/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
+++ b/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
@@ -310,6 +310,11 @@ namespace WTF {
       return QChar::category(c) == QChar::Other_Format;
     }
 
+    inline bool isArabicChar(UChar32 c)
+    {
+        return c >= 0x0600 && c <= 0x06FF;
+    }
+
     inline bool isPrintableChar(UChar32 c)
     {
       const uint test = U_MASK(QChar::Other_Control) |
@@ -455,6 +460,11 @@ namespace WTF {
       return (c & 0xffff0000) == 0 && QChar((unsigned short)c).isPrint();
     }
 
+    inline bool isArabicChar(UChar32 c)
+    {
+        return c >= 0x0600 && c <= 0x06FF;
+    }
+
     inline bool isSeparatorSpace(UChar32 c)
     {
       return (c & 0xffff0000) == 0 && QChar((unsigned short)c).category() == QChar::Separator_Space;

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 86d3b50cea851319b7656541ce6874609fd726fd..3a123d72cb16639b0757fa58b35da99f6bb35921 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-06  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Dan.
+
+        Use new helper function isArabicChar() - which also calls ublock_getCode() == UBLOCK_ARABIC on mac.
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::ATSULayoutParameters::initialize):
+
 2008-01-06  Andrew Wellington  <proton@wiretapped.net>
 
         Reviewed by Darin.

diff --git a/WebCore/platform/graphics/mac/FontMac.mm b/WebCore/platform/graphics/mac/FontMac.mm
index 2dba6133d8fc2666a35d5050f4d87ea345eaf243..0df24e65c28ca1429cf2c2e9c613d606d10dc78f 100644 (file)
--- a/WebCore/platform/graphics/mac/FontMac.mm
+++ b/WebCore/platform/graphics/mac/FontMac.mm
@@ -406,7 +406,7 @@ void ATSULayoutParameters::initialize(const Font* font, const GraphicsContext* g
                 else
                     break;
             }
-            if (!shapedArabic && ublock_getCode(m_run[i]) == UBLOCK_ARABIC && !r->shapesArabic()) {
+            if (!shapedArabic && WTF::Unicode::isArabicChar(m_run[i]) && !r->shapesArabic()) {
                 shapedArabic = true;
                 if (!m_charBuffer) {
                     m_charBuffer = new UChar[runLength];