[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:50:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8dc967c47a7443d21c1cf9a131c2f8c9d02232d7
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 7 00:11:08 2003 +0000
WebKit:
Fixed 3348630. Pick up about 1% by moving implementation of _unicodeDirection to WebCore and inlining.
Reviewed by Ken.
* Misc.subproj/WebUnicode.h:
* Misc.subproj/WebUnicode.m:
(_unicodeDirection):
(_unicodeJoining):
(_unicodeMirrored):
(WebKitInitializeUnicode):
* Misc.subproj/WebUnicodeTables.m:
WebCore:
Fixed 3348630. Pick up about 1% by moving implementation of _unicodeDirection to WebCore and inlining.
Reviewed by Ken.
* WebCore-combined.exp:
* WebCore.exp:
* WebCore.pbproj/project.pbxproj:
* kwq/KWQString.h:
* kwq/WebCoreUnicode.cpp:
* kwq/WebCoreUnicode.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7fd985f..aabd79f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-08-06 Richard Williamson <rjw at apple.com>
+
+ Fixed 3348630. Pick up about 1% by moving implementation of _unicodeDirection to WebCore and inlining.
+
+ Reviewed by Ken.
+
+ * WebCore-combined.exp:
+ * WebCore.exp:
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/KWQString.h:
+ * kwq/WebCoreUnicode.cpp:
+ * kwq/WebCoreUnicode.h:
+
2003-08-06 John Sullivan <sullivan at apple.com>
- fixed 3366587 -- Mail quits instantly (no crashlog) trying
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7fd985f..aabd79f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-08-06 Richard Williamson <rjw at apple.com>
+
+ Fixed 3348630. Pick up about 1% by moving implementation of _unicodeDirection to WebCore and inlining.
+
+ Reviewed by Ken.
+
+ * WebCore-combined.exp:
+ * WebCore.exp:
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/KWQString.h:
+ * kwq/WebCoreUnicode.cpp:
+ * kwq/WebCoreUnicode.h:
+
2003-08-06 John Sullivan <sullivan at apple.com>
- fixed 3366587 -- Mail quits instantly (no crashlog) trying
diff --git a/WebCore/WebCore-combined.exp b/WebCore/WebCore-combined.exp
index b59c023..2e4c55f 100644
--- a/WebCore/WebCore-combined.exp
+++ b/WebCore/WebCore-combined.exp
@@ -23,7 +23,7 @@ _WebCoreUnicodeMirroredFunction
_WebCoreUnicodeUpperFunction
_WebCoreInitializeTextRun
_WebCoreInitializeEmptyTextStyle
-__ZN10KWQMapImpl11endInternalEv
+_WebCoreDirectionInfo__ZN10KWQMapImpl11endInternalEv
__ZN10KWQMapImpl13beginInternalEv
__ZN10KWQMapImpl13clearInternalEv
__ZN10KWQMapImpl14insertInternalEP14KWQMapNodeImplb
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index 0df480b..6643a05 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -23,3 +23,4 @@ _WebCoreUnicodeMirroredFunction
_WebCoreUnicodeUpperFunction
_WebCoreInitializeTextRun
_WebCoreInitializeEmptyTextStyle
+_WebCoreDirectionInfo
\ No newline at end of file
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 00dfff1..525a82b 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -76,6 +76,8 @@
//083
//084
0867D690FE84028FC02AAC07 = {
+ buildSettings = {
+ };
buildStyles = (
014CEA440018CDF011CA2923,
014CEA450018CDF011CA2923,
@@ -819,11 +821,7 @@
buildActionMask = 2147483647;
files = (
);
- generatedFileNames = (
- );
isa = PBXShellScriptBuildPhase;
- neededFileNames = (
- );
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 0566f2d..dd4ac60 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -46,7 +46,7 @@ class QChar {
public:
enum Direction {
- DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+ DirL = 0, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
};
@@ -84,9 +84,13 @@ public:
QChar upper() const;
Direction direction() const
{
- return (QChar::Direction)WebCoreUnicodeDirectionFunction(c);
+ const unsigned char *rowp = WebCoreDirectionInfo[((unsigned char)(c>>8))];
+
+ if(!rowp)
+ return DirL;
+ return (QChar::Direction)( *(rowp+((unsigned char)(c))) &0x1f );
}
-
+
bool mirrored() const;
QChar mirroredChar() const;
diff --git a/WebCore/kwq/WebCoreUnicode.cpp b/WebCore/kwq/WebCoreUnicode.cpp
index 955afac..d1303db 100644
--- a/WebCore/kwq/WebCoreUnicode.cpp
+++ b/WebCore/kwq/WebCoreUnicode.cpp
@@ -34,3 +34,4 @@ UniChar (*WebCoreUnicodeMirroredCharFunction)(UniChar c);
WebCoreUnicodeCombiningClass (*WebCoreUnicodeCombiningClassFunction)(UniChar c);
UniChar (*WebCoreUnicodeLowerFunction)(UniChar c);
UniChar (*WebCoreUnicodeUpperFunction)(UniChar c);
+const unsigned char * const *WebCoreDirectionInfo;
diff --git a/WebCore/kwq/WebCoreUnicode.h b/WebCore/kwq/WebCoreUnicode.h
index f434fba..b153d91 100644
--- a/WebCore/kwq/WebCoreUnicode.h
+++ b/WebCore/kwq/WebCoreUnicode.h
@@ -72,7 +72,7 @@ extern "C" {
typedef enum
{
- DirectionL, // Left Letter
+ DirectionL = 0, // Left Letter
DirectionR, // Right Letter
DirectionEN, // European Number
DirectionES, // European Separator
@@ -163,6 +163,7 @@ extern "C" {
extern WebCoreUnicodeCombiningClass (*WebCoreUnicodeCombiningClassFunction)(UniChar c);
extern UniChar (*WebCoreUnicodeLowerFunction)(UniChar c);
extern UniChar (*WebCoreUnicodeUpperFunction)(UniChar c);
+ extern const unsigned char * const *WebCoreDirectionInfo;
#ifdef __cplusplus
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 609fca4..22fe73b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-06 Richard Williamson <rjw at apple.com>
+
+ Fixed 3348630. Pick up about 1% by moving implementation of _unicodeDirection to WebCore and inlining.
+
+ Reviewed by Ken.
+
+ * Misc.subproj/WebUnicode.h:
+ * Misc.subproj/WebUnicode.m:
+ (_unicodeDirection):
+ (_unicodeJoining):
+ (_unicodeMirrored):
+ (WebKitInitializeUnicode):
+ * Misc.subproj/WebUnicodeTables.m:
+
2003-08-06 Chris Blumenberg <cblu at apple.com>
Fixed: <rdar://problem/3161102>: Avoid retain cycles by destroying plug-ins in the page cache before dealloc
diff --git a/WebKit/Misc.subproj/WebUnicode.h b/WebKit/Misc.subproj/WebUnicode.h
index 6b7a89d..558a9c0 100644
--- a/WebKit/Misc.subproj/WebUnicode.h
+++ b/WebKit/Misc.subproj/WebUnicode.h
@@ -12,7 +12,7 @@ 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 char * const _WebDirectionInfo[];
extern const unsigned short * const decomposition_info[];
extern const unsigned short decomposition_map[];
extern const unsigned short symmetricPairs[];
diff --git a/WebKit/Misc.subproj/WebUnicode.m b/WebKit/Misc.subproj/WebUnicode.m
index 05717b1..f82bccf 100644
--- a/WebKit/Misc.subproj/WebUnicode.m
+++ b/WebKit/Misc.subproj/WebUnicode.m
@@ -21,7 +21,7 @@ static WebCoreUnicodeCategory _unicodeCategory(UniChar c)
static WebCoreUnicodeDirection _unicodeDirection(UniChar c)
{
- const unsigned char *rowp = direction_info[WK_ROW(c)];
+ const unsigned char *rowp = _WebDirectionInfo[WK_ROW(c)];
if(!rowp)
return DirectionL;
@@ -30,7 +30,7 @@ static WebCoreUnicodeDirection _unicodeDirection(UniChar c)
static WebCoreUnicodeJoining _unicodeJoining(UniChar c)
{
- const unsigned char *rowp = direction_info[WK_ROW(c)];
+ const unsigned char *rowp = _WebDirectionInfo[WK_ROW(c)];
if ( !rowp )
return JoiningOther;
return (WebCoreUnicodeJoining) ((*(rowp+WK_CELL(c)) >> 5) &0x3);
@@ -51,7 +51,7 @@ static WebCoreUnicodeDecomposition _unicodeDecompositionTag(UniChar c)
static bool _unicodeMirrored(UniChar c)
{
- const unsigned char *rowp = direction_info[WK_ROW(c)];
+ const unsigned char *rowp = _WebDirectionInfo[WK_ROW(c)];
if ( !rowp )
return FALSE;
return *(rowp+WK_CELL(c))>128;
@@ -116,6 +116,7 @@ void WebKitInitializeUnicode(void)
WebCoreUnicodeCombiningClassFunction = _unicodeCombiningClass;
WebCoreUnicodeLowerFunction = _unicodeLower;
WebCoreUnicodeUpperFunction = _unicodeUpper;
+ WebCoreDirectionInfo = _WebDirectionInfo;
}
// The unicode to unicode shaping codec.
diff --git a/WebKit/Misc.subproj/WebUnicodeTables.m b/WebKit/Misc.subproj/WebUnicodeTables.m
index 80f619a..baa02d6 100644
--- a/WebKit/Misc.subproj/WebUnicodeTables.m
+++ b/WebKit/Misc.subproj/WebUnicodeTables.m
@@ -275,7 +275,7 @@ print "// $size bytes\n\n";
# Build direction/joining/mirrored pages...
#
$rowtable_txt =
- "static const Q_UINT8 * const direction_info[256] = {";
+ "static const Q_UINT8 * const _WebDirectionInfo[256] = {";
for $dir_row ( 0..255 ) {
$nonzero=0;
$txt = "";
@@ -9559,7 +9559,7 @@ static const Q_UINT8 dir_FF[] = {
0, 18, 18, 18, 10, 10, 0, 0,
};
-const Q_UINT8 * const direction_info[256] = {
+const Q_UINT8 * const _WebDirectionInfo[256] = {
dir_00, dir_01, dir_02, dir_03, dir_04, dir_05, dir_06, dir_07,
dir_01, dir_09, dir_0A, dir_0B, dir_0C, dir_0D, dir_0E, dir_0F,
dir_10, dir_01, dir_01, dir_01, dir_01, dir_01, dir_16, dir_17,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list