[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 34bc8e15f98a3d17f9f27114330cdacdea7a7e9f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 31 22:15:25 2002 +0000

            Corrected extern definitions of lookup tables.
    
            * Misc.subproj/WebUnicode.h:
            * Misc.subproj/WebUnicode.m:
            (_unicodeDirection):
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (+[WebTextRenderer initialize]):
    
            Turned on use of lookup tables.
    
            * kwq/KWQChar.mm:
            (QChar::direction):
            (QChar::mirrored):
            (QChar::mirroredChar):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4589203..08a80b7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-31  Richard Williamson  <rjw at apple.com>
+
+        Turned on use of lookup tables.
+        
+        * kwq/KWQChar.mm:
+        (QChar::direction):
+        (QChar::mirrored):
+        (QChar::mirroredChar):
+
 2002-10-31  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3075803 - yahoo customize layout - delete, ordering of items doesn't work
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4589203..08a80b7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-10-31  Richard Williamson  <rjw at apple.com>
+
+        Turned on use of lookup tables.
+        
+        * kwq/KWQChar.mm:
+        (QChar::direction):
+        (QChar::mirrored):
+        (QChar::mirroredChar):
+
 2002-10-31  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3075803 - yahoo customize layout - delete, ordering of items doesn't work
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4589203..08a80b7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-10-31  Richard Williamson  <rjw at apple.com>
+
+        Turned on use of lookup tables.
+        
+        * kwq/KWQChar.mm:
+        (QChar::direction):
+        (QChar::mirrored):
+        (QChar::mirroredChar):
+
 2002-10-31  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3075803 - yahoo customize layout - delete, ordering of items doesn't work
diff --git a/WebCore/kwq/KWQChar.mm b/WebCore/kwq/KWQChar.mm
index 91d1bf3..b0c2790 100644
--- a/WebCore/kwq/KWQChar.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -25,6 +25,8 @@
 
 #import "KWQString.h"
 #import "KWQLogging.h"
+#import "WebCoreUnicode.h"
+
 #import <Foundation/Foundation.h>
 
 #import <CoreFoundation/CFBidi.h>
@@ -105,6 +107,7 @@ QChar QChar::upper() const
 
 QChar::Direction QChar::direction() const
 {
+#ifdef OLD_WAY
     uint8_t type;
     QChar::Direction dir = DirL;
 
@@ -176,22 +179,18 @@ QChar::Direction QChar::direction() const
             break;
     }
     return dir;
+#endif
+    return (QChar::Direction)WebCoreUnicodeDirectionFunction(c);
 }
 
 bool QChar::mirrored() const
 {
-    // FIXME: unimplemented because we don't do BIDI yet
-    ERROR("not yet implemented");
-    // return whether character should be reversed if text direction is reversed
-    return false;
+    return WebCoreUnicodeMirroredFunction(c);
 }
 
 QChar QChar::mirroredChar() const
 {
-    // FIXME: unimplemented because we don't do BIDI yet
-    ERROR("not yet implemented");
-    // return mirrored character if it is mirrored else return itself
-    return *this;
+    return QChar(WebCoreUnicodeMirroredCharFunction(c));
 }
 
 int QChar::digitValue() const
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f620b79..1a0a03d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-31  Richard Williamson  <rjw at apple.com>
+
+        Corrected extern definitions of lookup tables.
+        
+        * Misc.subproj/WebUnicode.h:
+        * Misc.subproj/WebUnicode.m:
+        (_unicodeDirection):
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (+[WebTextRenderer initialize]):
+
 === 30 ===
 
 2002-10-30  Richard Williamson  <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f620b79..1a0a03d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-10-31  Richard Williamson  <rjw at apple.com>
+
+        Corrected extern definitions of lookup tables.
+        
+        * Misc.subproj/WebUnicode.h:
+        * Misc.subproj/WebUnicode.m:
+        (_unicodeDirection):
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (+[WebTextRenderer initialize]):
+
 === 30 ===
 
 2002-10-30  Richard Williamson  <rjw at apple.com>
diff --git a/WebKit/Misc.subproj/WebUnicode.h b/WebKit/Misc.subproj/WebUnicode.h
index d042a39..458d5f9 100644
--- a/WebKit/Misc.subproj/WebUnicode.h
+++ b/WebKit/Misc.subproj/WebUnicode.h
@@ -6,12 +6,12 @@
 */
 extern void WebKitInitializeUnicode(void);
 
-extern const unsigned char * const *combining_info;
-extern const char * const *decimal_info;
-extern const unsigned char *const *unicode_info;
-extern const unsigned char * const *direction_info;
-extern const unsigned short * const *decomposition_info;
-extern const unsigned short *decomposition_map;
-extern const unsigned short *symmetricPairs;
+extern const unsigned char * const combining_info[];
+extern const char * const decimal_info[];
+extern const unsigned char * const unicode_info[];
+extern const unsigned char * const direction_info[];
+extern const unsigned short * const decomposition_info[];
+extern const unsigned short decomposition_map[];
+extern const unsigned short symmetricPairs[];
 extern int symmetricPairsSize;
-extern const unsigned short * const *case_info;
+extern const unsigned short * const case_info[];
diff --git a/WebKit/Misc.subproj/WebUnicode.m b/WebKit/Misc.subproj/WebUnicode.m
index c857705..3bf0fca 100644
--- a/WebKit/Misc.subproj/WebUnicode.m
+++ b/WebKit/Misc.subproj/WebUnicode.m
@@ -26,6 +26,7 @@ static WebCoreUnicodeCategory _unicodeCategory(UniChar c)
 static WebCoreUnicodeDirection _unicodeDirection(UniChar c)
 {
     const unsigned char *rowp = direction_info[ROW(c)];
+    
     if(!rowp) 
         return DirectionL;
     return (WebCoreUnicodeDirection) ( *(rowp+CELL(c)) &0x1f );
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 8672385..97ae56e 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -11,8 +11,9 @@
 #import <CoreGraphics/CoreGraphicsPrivate.h>
 
 #import <WebKit/WebGlyphBuffer.h>
-#import <WebKit/WebTextRendererFactory.h>
 #import <WebKit/WebKitLogging.h>
+#import <WebKit/WebTextRendererFactory.h>
+#import <WebKit/WebUnicode.h>
 
 #import <QD/ATSUnicodePriv.h>
 
@@ -221,6 +222,7 @@ static BOOL bufferTextDrawing = NO;
 
 + (void)initialize
 {
+    WebKitInitializeUnicode();
     nonBaseChars = CFCharacterSetGetPredefined(kCFCharacterSetNonBase);
     bufferTextDrawing = [[[NSUserDefaults standardUserDefaults] stringForKey:@"BufferTextDrawing"] isEqual: @"YES"];
 }

-- 
WebKit Debian packaging