[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e4fe12a0d22b09655344bc8c19a836b2133b9d57
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 7 18:57:39 2003 +0000

    WebKit:
    	Fixed 3477067.  Use our case unicode conversion routines.
    
            Reviewed by Ken.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (toUpper):
    WebCore:
    	Fixed 3477067.  Use our case unicode conversion routines.
    
            Reviewed by Ken.
    
            * kwq/KWQChar.mm:
            (QChar::lower):
            (QChar::upper):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a73c03b..d7e4f10 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-11-07  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3477067.  Use our case unicode conversion routines.
+
+        Reviewed by Ken.
+
+        * kwq/KWQChar.mm:
+        (QChar::lower):
+        (QChar::upper):
+
 2003-11-06  David Hyatt  <hyatt at apple.com>
 
 	Fixes for 3476717, inline blocks should expand to encompass floats; 3476718, inline blocks should not
diff --git a/WebCore/kwq/KWQChar.mm b/WebCore/kwq/KWQChar.mm
index aae812a..0f92823 100644
--- a/WebCore/kwq/KWQChar.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -29,16 +29,6 @@
 
 #import <Foundation/Foundation.h>
 
-static UniChar scratchUniChar;
-
-static CFMutableStringRef GetScratchUniCharString()
-{
-    static CFMutableStringRef s = NULL;
-    if (!s)
-        s = CFStringCreateMutableWithExternalCharactersNoCopy(kCFAllocatorDefault, &scratchUniChar, 1, 1, kCFAllocatorNull);
-    return s;
-}
-
 bool QChar::isDigit() const
 {
     static CFCharacterSetRef set = CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit);
@@ -70,24 +60,12 @@ bool QChar::isPunct() const
 
 QChar QChar::lower() const
 {
-    // Without this first quick case, this function was showing up in profiles.
-    if (c <= 0x7F) {
-        return (char)tolower(c);
-    }
-    scratchUniChar = c;
-    CFStringLowercase(GetScratchUniCharString(), NULL);
-    return scratchUniChar;
+    return WebCoreUnicodeLowerFunction(c);
 }
 
 QChar QChar::upper() const
 {
-    // Without this first quick case, this function was showing up in profiles.
-    if (c <= 0x7F) {
-        return (char)toupper(c);
-    }
-    scratchUniChar = c;
-    CFStringUppercase(GetScratchUniCharString(), NULL);
-    return scratchUniChar;
+    return WebCoreUnicodeUpperFunction(c);
 }
 
 bool QChar::mirrored() const
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 139a610..54720e2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-07  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3477067.  Use our case unicode conversion routines.
+
+        Reviewed by Ken.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (toUpper):
+
 2003-11-06  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3476393.  Call scrollPoint: recursively up the view hierarchy to ensure point is visible.
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 587a73f..db763f6 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -2091,25 +2091,9 @@ static inline BOOL fontContainsString (NSFont *font, NSString *string)
     return NO;
 }
 
-static UniChar scratchUniChar;
-
-static CFMutableStringRef GetScratchUniCharString()
-{
-    static CFMutableStringRef s = NULL;
-    if (!s)
-        s = CFStringCreateMutableWithExternalCharactersNoCopy(kCFAllocatorDefault, &scratchUniChar, 1, 1, kCFAllocatorNull);
-    return s;
-}
-
 static inline UniChar toUpper(UniChar c)
 {
-    // Without this first quick case, this function was showing up in profiles.
-    if (c <= 0x7F) {
-        return (char)toupper(c);
-    }
-    scratchUniChar = c;
-    CFStringUppercase(GetScratchUniCharString(), NULL);
-    return scratchUniChar;
+    return WebCoreUnicodeUpperFunction(c);
 }
 
 static inline BOOL isUpper(UniChar c)

-- 
WebKit Debian packaging