[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 06:09:44 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 742dd7ee3dcbe2d94c51e4ca6a63cdf6d3b1fd29
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 25 21:50:32 2002 +0000
Add a workaround for Radar 2912404 (kCFStringEncodingInvalidId is negative even
though CFStringEncoding is unsigned)
* kwq/KWQCharsets.mm:
(KWQCFStringEncodingFromIANACharsetName):
(KWQCFStringEncodingFromMIB):
* kwq/KWQtextcodec.mm:
(QTextCodec::codecForMib):
(QTextCodec::codecForName):
* kwq/make-charset-table.pl:
Add casts to (CFStringEncoding) wherever we use kCFStringEncodingInvalidId.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1076 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e882f81..76e505e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,4 +1,20 @@
-:RU2002-04-25 Darin Adler <darin at apple.com>
+2002-04-25 Darin Adler <darin at apple.com>
+
+ Add a workaround for Radar 2912404 (kCFStringEncodingInvalidId is negative even
+ though CFStringEncoding is unsigned)
+
+ * kwq/KWQCharsets.mm:
+ (KWQCFStringEncodingFromIANACharsetName):
+ (KWQCFStringEncodingFromMIB):
+ * kwq/KWQtextcodec.mm:
+ (QTextCodec::codecForMib):
+ (QTextCodec::codecForName):
+ * kwq/make-charset-table.pl:
+ Add casts to (CFStringEncoding) wherever we use kCFStringEncodingInvalidId.
+
+2002-04-25 Darin Adler <darin at apple.com>
+
+ Rework plugin code to prepare to move more of it into WebKit.
* khtml/rendering/render_applet.cpp:
(RenderApplet::RenderApplet): Create a widget for the applet using
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e882f81..76e505e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,4 +1,20 @@
-:RU2002-04-25 Darin Adler <darin at apple.com>
+2002-04-25 Darin Adler <darin at apple.com>
+
+ Add a workaround for Radar 2912404 (kCFStringEncodingInvalidId is negative even
+ though CFStringEncoding is unsigned)
+
+ * kwq/KWQCharsets.mm:
+ (KWQCFStringEncodingFromIANACharsetName):
+ (KWQCFStringEncodingFromMIB):
+ * kwq/KWQtextcodec.mm:
+ (QTextCodec::codecForMib):
+ (QTextCodec::codecForName):
+ * kwq/make-charset-table.pl:
+ Add casts to (CFStringEncoding) wherever we use kCFStringEncodingInvalidId.
+
+2002-04-25 Darin Adler <darin at apple.com>
+
+ Rework plugin code to prepare to move more of it into WebKit.
* khtml/rendering/render_applet.cpp:
(RenderApplet::RenderApplet): Create a widget for the applet using
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e882f81..76e505e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,4 +1,20 @@
-:RU2002-04-25 Darin Adler <darin at apple.com>
+2002-04-25 Darin Adler <darin at apple.com>
+
+ Add a workaround for Radar 2912404 (kCFStringEncodingInvalidId is negative even
+ though CFStringEncoding is unsigned)
+
+ * kwq/KWQCharsets.mm:
+ (KWQCFStringEncodingFromIANACharsetName):
+ (KWQCFStringEncodingFromMIB):
+ * kwq/KWQtextcodec.mm:
+ (QTextCodec::codecForMib):
+ (QTextCodec::codecForName):
+ * kwq/make-charset-table.pl:
+ Add casts to (CFStringEncoding) wherever we use kCFStringEncodingInvalidId.
+
+2002-04-25 Darin Adler <darin at apple.com>
+
+ Rework plugin code to prepare to move more of it into WebKit.
* khtml/rendering/render_applet.cpp:
(RenderApplet::RenderApplet): Create a widget for the applet using
diff --git a/WebCore/kwq/KWQCharsets.mm b/WebCore/kwq/KWQCharsets.mm
index e79d352..04a8160 100644
--- a/WebCore/kwq/KWQCharsets.mm
+++ b/WebCore/kwq/KWQCharsets.mm
@@ -79,7 +79,8 @@ CFStringEncoding KWQCFStringEncodingFromIANACharsetName(CFStringRef charsetName)
if (CFDictionaryGetValueIfPresent(nameToEncoding, (void *) charsetName, &value)) {
return (CFStringEncoding) value;
} else {
- return kCFStringEncodingInvalidId;
+ // FIXME: This cast to CFStringEncoding is a workaround for Radar 2912404.
+ return (CFStringEncoding) kCFStringEncodingInvalidId;
}
}
@@ -95,7 +96,8 @@ CFStringEncoding KWQCFStringEncodingFromMIB(int mib)
if (CFDictionaryGetValueIfPresent(mibToEncoding, (void *) mib, &value)) {
return (CFStringEncoding) value;
} else {
- return kCFStringEncodingInvalidId;
+ // FIXME: This cast to CFStringEncoding is a workaround for Radar 2912404.
+ return (CFStringEncoding) kCFStringEncodingInvalidId;
}
}
diff --git a/WebCore/kwq/KWQTextCodec.mm b/WebCore/kwq/KWQTextCodec.mm
index d95256f..087f600 100644
--- a/WebCore/kwq/KWQTextCodec.mm
+++ b/WebCore/kwq/KWQTextCodec.mm
@@ -88,7 +88,8 @@ QTextCodec *QTextCodec::codecForMib(int mib)
encoding = KWQCFStringEncodingFromMIB(mib);
- if (encoding == kCFStringEncodingInvalidId) {
+ // FIXME: This cast to CFStringEncoding is a workaround for Radar 2912404.
+ if (encoding == (CFStringEncoding) kCFStringEncodingInvalidId) {
return NULL;
} else {
return codecForCFStringEncoding(encoding);
@@ -106,7 +107,8 @@ QTextCodec *QTextCodec::codecForName(const char *name, int accuracy)
encoding = KWQCFStringEncodingFromIANACharsetName(cfname);
CFRelease(cfname);
- if (encoding == kCFStringEncodingInvalidId) {
+ // FIXME: This cast to CFStringEncoding is a workaround for Radar 2912404.
+ if (encoding == (CFStringEncoding) kCFStringEncodingInvalidId) {
return NULL;
} else {
return codecForCFStringEncoding(encoding);
diff --git a/WebCore/kwq/make-charset-table.pl b/WebCore/kwq/make-charset-table.pl
index ae23aee..4b5a7be 100755
--- a/WebCore/kwq/make-charset-table.pl
+++ b/WebCore/kwq/make-charset-table.pl
@@ -13,7 +13,8 @@ my %used_mac_encodings;
my $already_wrote_one = 0;
-
+# FIXME: This cast to CFStringEncoding is a workaround for Radar 2912404.
+my $invalid_encoding = "((CFStringEncoding)kCFStringEncodingInvalidId)";
sub emit_prefix
{
@@ -22,7 +23,7 @@ sub emit_prefix
sub emit_suffix
{
- print TABLE ",\n {NULL,\n -1,\n kCFStringEncodingInvalidId}\n};\n";
+ print TABLE ",\n {NULL,\n -1,\n $invalid_encoding}\n};\n";
}
@@ -35,7 +36,7 @@ sub emit_output
$mib_enum = "1004";
}
- my $mac_string_encoding = "kCFStringEncodingInvalidId";
+ my $mac_string_encoding = $invalid_encoding;
foreach my $name ($canonical_name, @aliases) {
$name =~ tr/A-Z/a-z/;
@@ -45,7 +46,7 @@ sub emit_output
}
}
- unless ($MAC_SUPPORTED_ONLY && $mac_string_encoding eq "kCFStringEncodingInvalidId") {
+ unless ($MAC_SUPPORTED_ONLY && $mac_string_encoding eq $invalid_encoding) {
foreach my $name ($canonical_name, @aliases) {
print TABLE ",\n" if ($already_wrote_one);
print TABLE ' {"' . ${name} . '",' . "\n";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list