[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:30:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 720010004ecd499952f43f11fbc932a6928afdf5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 21 17:26:56 2003 +0000
WebFoundation:
Reviewed by John.
- fixed 3204660 -- EUC decoding not used for japanese yahoo page
* Misc.subproj/WebNSStringExtras.m: (-[NSString _web_characterSetFromContentTypeHeader]):
Do the search for charset= in a case-insensitive way. It's possible that other
browsers are case-insensitive, but also possible that it's just Japanese
auto-detect that papers over this problem there.
- other changes
* Database.subproj/WebLRUFileList.m: (cStringHash): Get rid of unnecessary code to avoid
hashes of 0. This is helpful in the place in JavaScriptCore where we copied this from, but
it is not helpful here (slightly ugly and does slow things down a smidgen).
WebCore:
Reviewed by John.
- fixed 3204660 -- EUC decoding not used for japanese yahoo page
* khtml/misc/decoder.cpp: (Decoder::decode):
Do the search for charset= in a case-insensitive way. It's possible that other
browsers are case-insensitive, but also possible that it's just Japanese
auto-detect that papers over this problem there.
- other changes
* kwq/KWQString.mm: (QString::hash): Get rid of unnecessary code to avoid hashes of 0.
This is useful in the place in JavaScriptCore where we copied this from, but
it is not helpful here (slightly ugly and does slow things down a smidgen).
* kwq/WebCoreTextRendererFactory.m: Remove unused method.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3889 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a29bf60..a0ab98e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2003-03-21 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3204660 -- EUC decoding not used for japanese yahoo page
+
+ * khtml/misc/decoder.cpp: (Decoder::decode):
+ Do the search for charset= in a case-insensitive way. It's possible that other
+ browsers are case-insensitive, but also possible that it's just Japanese
+ auto-detect that papers over this problem there.
+
+ - other changes
+
+ * kwq/KWQString.mm: (QString::hash): Get rid of unnecessary code to avoid hashes of 0.
+ This is useful in the place in JavaScriptCore where we copied this from, but
+ it is not helpful here (slightly ugly and does slow things down a smidgen).
+
+ * kwq/WebCoreTextRendererFactory.m: Remove unused method.
+
2003-03-20 David Hyatt <hyatt at apple.com>
Fix the color handling of link= attributes on <body> elements
@@ -66,7 +85,6 @@
Reviewed by darin (res. style fix 1) and gramps (rest of res. style fix and XML fix)
- * ChangeLog:
* khtml/css/quirks.css:
* khtml/html/html_tableimpl.cpp:
(HTMLTableElementImpl::attach):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a29bf60..a0ab98e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2003-03-21 Darin Adler <darin at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3204660 -- EUC decoding not used for japanese yahoo page
+
+ * khtml/misc/decoder.cpp: (Decoder::decode):
+ Do the search for charset= in a case-insensitive way. It's possible that other
+ browsers are case-insensitive, but also possible that it's just Japanese
+ auto-detect that papers over this problem there.
+
+ - other changes
+
+ * kwq/KWQString.mm: (QString::hash): Get rid of unnecessary code to avoid hashes of 0.
+ This is useful in the place in JavaScriptCore where we copied this from, but
+ it is not helpful here (slightly ugly and does slow things down a smidgen).
+
+ * kwq/WebCoreTextRendererFactory.m: Remove unused method.
+
2003-03-20 David Hyatt <hyatt at apple.com>
Fix the color handling of link= attributes on <body> elements
@@ -66,7 +85,6 @@
Reviewed by darin (res. style fix 1) and gramps (rest of res. style fix and XML fix)
- * ChangeLog:
* khtml/css/quirks.css:
* khtml/html/html_tableimpl.cpp:
(HTMLTableElementImpl::attach):
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index 471ea98..1da5b79 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -420,7 +420,7 @@ QString Decoder::decode(const char *data, int len)
//if( (pos = str.find("http-equiv", pos)) == -1) break;
//if( (pos = str.find("content-type", pos)) == -1) break;
while( pos < ( int ) str.length() ) {
- if( (pos = str.find("charset", pos)) == -1) break;
+ if( (pos = str.find("charset", pos, false)) == -1) break;
pos += 7;
// skip whitespace..
while( pos < (int)str.length() && str[pos] <= ' ' ) pos++;
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index d8b0db5..2dbbdf9 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -2589,8 +2589,6 @@ uint QString::hash() const
h ^= (h >> 11);
h += (h << 15);
- if (h == 0)
- h = 0x80000000;
return h;
}
diff --git a/WebCore/kwq/WebCoreTextRendererFactory.m b/WebCore/kwq/WebCoreTextRendererFactory.m
index dad7042..1910d56 100644
--- a/WebCore/kwq/WebCoreTextRendererFactory.m
+++ b/WebCore/kwq/WebCoreTextRendererFactory.m
@@ -35,7 +35,7 @@ static WebCoreTextRendererFactory *sharedFactory;
return sharedFactory;
}
-- (BOOL)isFontFixedPitch: (NSFont *)font
+- (BOOL)isFontFixedPitch:(NSFont *)font
{
return NO;
}
@@ -50,12 +50,7 @@ static WebCoreTextRendererFactory *sharedFactory;
return self;
}
-- (id <WebCoreTextRenderer>)rendererWithFont: (NSFont *)font
-{
- return nil;
-}
-
-- (NSFont *)fontWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (id <WebCoreTextRenderer>)rendererWithFont:(NSFont *)font
{
return nil;
}
diff --git a/WebCore/kwq/WebCoreTextRendererFactory.mm b/WebCore/kwq/WebCoreTextRendererFactory.mm
index dad7042..1910d56 100644
--- a/WebCore/kwq/WebCoreTextRendererFactory.mm
+++ b/WebCore/kwq/WebCoreTextRendererFactory.mm
@@ -35,7 +35,7 @@ static WebCoreTextRendererFactory *sharedFactory;
return sharedFactory;
}
-- (BOOL)isFontFixedPitch: (NSFont *)font
+- (BOOL)isFontFixedPitch:(NSFont *)font
{
return NO;
}
@@ -50,12 +50,7 @@ static WebCoreTextRendererFactory *sharedFactory;
return self;
}
-- (id <WebCoreTextRenderer>)rendererWithFont: (NSFont *)font
-{
- return nil;
-}
-
-- (NSFont *)fontWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (id <WebCoreTextRenderer>)rendererWithFont:(NSFont *)font
{
return nil;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list