[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 d8c8c401ee555d5dd86347eab8576ca41d641e9f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 16 03:40:43 2001 +0000

    Changed standard default font sizes.
    Fixed relative URL problem.
    Fixed color names of the form #fff.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@460 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQColor.mm b/WebCore/kwq/KWQColor.mm
index 6e252e2..9c14854 100644
--- a/WebCore/kwq/KWQColor.mm
+++ b/WebCore/kwq/KWQColor.mm
@@ -30,6 +30,7 @@
 
 static NSDictionary *namedColors;
 
+#define ROUND_TO_INT(f) ((int)rint((f)))
 
 QRgb qRgb(int r, int g, int b)
 {
@@ -179,9 +180,10 @@ static bool decodeColorFromHexColorString(const QString &string, int *r, int *g,
             *b = (hex2int(p[4]) << 4) + hex2int(p[5]);
             decoded = TRUE;    
         } else if (len == 3) {
-            *r = hex2int(p[0]);
-            *g = hex2int(p[1]);
-            *b = hex2int(p[2]);
+            // Convert 0 to 15, to 0 to 255.
+            *r = ROUND_TO_INT((1.0f/15.0f) * hex2int(p[0]) * 255.0f);
+            *g = ROUND_TO_INT((1.0f/15.0f) * hex2int(p[1]) * 255.0f);
+            *b = ROUND_TO_INT((1.0f/15.0f) * hex2int(p[2]) * 255.0f);
             decoded = TRUE;    
         }
     }
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index cb2ddfc..d0eef1d 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -242,8 +242,8 @@ public:
     int find(const char *, int index=0, bool cs=TRUE) const;
     int find(const QRegExp &, int index=0) const;
 
-    int findRev(char, int index=0) const;
-    int findRev(const char *, int index=0) const;
+    int findRev(char, int index=-1) const;
+    int findRev(const char *, int index=-1) const;
 
     int contains(char) const;
     int contains(const char *, bool cs=TRUE) const;
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index cb2ddfc..d0eef1d 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -242,8 +242,8 @@ public:
     int find(const char *, int index=0, bool cs=TRUE) const;
     int find(const QRegExp &, int index=0) const;
 
-    int findRev(char, int index=0) const;
-    int findRev(const char *, int index=0) const;
+    int findRev(char, int index=-1) const;
+    int findRev(const char *, int index=-1) const;
 
     int contains(char) const;
     int contains(const char *, bool cs=TRUE) const;
diff --git a/WebCore/src/kwq/KWQColor.mm b/WebCore/src/kwq/KWQColor.mm
index 6e252e2..9c14854 100644
--- a/WebCore/src/kwq/KWQColor.mm
+++ b/WebCore/src/kwq/KWQColor.mm
@@ -30,6 +30,7 @@
 
 static NSDictionary *namedColors;
 
+#define ROUND_TO_INT(f) ((int)rint((f)))
 
 QRgb qRgb(int r, int g, int b)
 {
@@ -179,9 +180,10 @@ static bool decodeColorFromHexColorString(const QString &string, int *r, int *g,
             *b = (hex2int(p[4]) << 4) + hex2int(p[5]);
             decoded = TRUE;    
         } else if (len == 3) {
-            *r = hex2int(p[0]);
-            *g = hex2int(p[1]);
-            *b = hex2int(p[2]);
+            // Convert 0 to 15, to 0 to 255.
+            *r = ROUND_TO_INT((1.0f/15.0f) * hex2int(p[0]) * 255.0f);
+            *g = ROUND_TO_INT((1.0f/15.0f) * hex2int(p[1]) * 255.0f);
+            *b = ROUND_TO_INT((1.0f/15.0f) * hex2int(p[2]) * 255.0f);
             decoded = TRUE;    
         }
     }
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index cb2ddfc..d0eef1d 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -242,8 +242,8 @@ public:
     int find(const char *, int index=0, bool cs=TRUE) const;
     int find(const QRegExp &, int index=0) const;
 
-    int findRev(char, int index=0) const;
-    int findRev(const char *, int index=0) const;
+    int findRev(char, int index=-1) const;
+    int findRev(const char *, int index=-1) const;
 
     int contains(char) const;
     int contains(const char *, bool cs=TRUE) const;
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/NSWebPageDataSource.mm
index c616451..18fcc06 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/NSWebPageDataSource.mm
@@ -9,10 +9,10 @@
 
     NSAutoreleasePool *localPool;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"8", @"10", @"12", @"14", @"16", @"18", @"20", nil];
+    NSArray *fontSizeArray = [NSArray arrayWithObjects:@"6", @"7", @"8", @"9", @"10", @"12", @"14", @"16", nil];
     
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-        @"0x8", 		@"WebKitLogLevel",
+        @"0xffffffff", 		@"WebKitLogLevel",
         @"Arial", 		@"WebKitStandardFont",
         @"Courier",  		@"WebKitFixedFont",
         @"Times-Roman", 	@"WebKitSerifFont",

-- 
WebKit Debian packaging