[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:31:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5d81c8891087a6113bdced3ec8b5c60d6e097394
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 14 14:19:58 2002 +0000
Fix the build.
* khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::putValue):
Add braces and fix a syntax error.
* kwq/mac-encodings.txt: Add comments. Make utf-16 be a synonym for
utf-8 rather than having it actually try to treat things as 16-bit.
We will have to revisit this, but for now it makes zingermans.com work again.
* kwq/make-charset-table.pl: Allow comments.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1814 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index af731a1..8a5be6c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-08-14 Darin Adler <darin at apple.com>
+
+ Fix the build.
+
+ * khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::putValue):
+ Add braces and fix a syntax error.
+
+ * kwq/mac-encodings.txt: Add comments. Make utf-16 be a synonym for
+ utf-8 rather than having it actually try to treat things as 16-bit.
+ We will have to revisit this, but for now it makes zingermans.com work again.
+
+ * kwq/make-charset-table.pl: Allow comments.
+
2002-08-14 Maciej Stachowiak <mjs at apple.com>
Fixed a JavaScript object leak that was plaguing ign.com and
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index af731a1..8a5be6c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-08-14 Darin Adler <darin at apple.com>
+
+ Fix the build.
+
+ * khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::putValue):
+ Add braces and fix a syntax error.
+
+ * kwq/mac-encodings.txt: Add comments. Make utf-16 be a synonym for
+ utf-8 rather than having it actually try to treat things as 16-bit.
+ We will have to revisit this, but for now it makes zingermans.com work again.
+
+ * kwq/make-charset-table.pl: Allow comments.
+
2002-08-14 Maciej Stachowiak <mjs at apple.com>
Fixed a JavaScript object leak that was plaguing ign.com and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index af731a1..8a5be6c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-08-14 Darin Adler <darin at apple.com>
+
+ Fix the build.
+
+ * khtml/ecma/kjs_html.cpp: (KJS::HTMLDocument::putValue):
+ Add braces and fix a syntax error.
+
+ * kwq/mac-encodings.txt: Add comments. Make utf-16 be a synonym for
+ utf-8 rather than having it actually try to treat things as 16-bit.
+ We will have to revisit this, but for now it makes zingermans.com work again.
+
+ * kwq/make-charset-table.pl: Allow comments.
+
2002-08-14 Maciej Stachowiak <mjs at apple.com>
Fixed a JavaScript object leak that was plaguing ign.com and
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index da61a32..4100b4f 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -280,12 +280,13 @@ void KJS::HTMLDocument::putValue(ExecState *exec, int token, const Value& value,
case Title:
doc.setTitle(value.toString(exec).string());
break;
- case Body:
- DOMNode node = new DOMNode(exec, KJS::toNode(value));
+ case Body: {
+ DOMNode *node = new DOMNode(exec, KJS::toNode(value));
// This is required to avoid leaking the node.
Value nodeValue(node);
- doc.setBody(()->toNode());
+ doc.setBody(node->toNode());
break;
+ }
case Domain: { // not part of the DOM
DOM::HTMLDocumentImpl* docimpl = static_cast<DOM::HTMLDocumentImpl*>(doc.handle());
if (docimpl)
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 09349a2..f2815ef 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -1,10 +1,19 @@
+# The items on the left are names of CFStringEncoding values (without the leading kCFStringEncoding).
+# The items on the right are IANA character set names. Names listed in character-sets.txt are not
+# repeated here; mentioning any one character set from a group in there pulls in all the aliases in
+# that group.
+
MacRoman: macintosh
WindowsLatin1: windows-1252, x-ansi
ISOLatin1: iso-8859-1, iso8859-1
NextStepLatin: x-nextstep
ASCII: us-ascii, iso-ir-6us
-Unicode: utf-16be, unicodeFFFE, unicode, utf-16
-UTF8: utf-8, unicode-1-1-utf-8, unicode-2-0-utf-8, x-unicode-2-0-utf-8
+Unicode # utf-16be, unicodeFFFE, unicode? (would this help us?)
+ # Note the bogus entry to make UTF-16 mean UTF-8.
+ # We do this because Internet Explorere does, and because web pages say UTF-16 and mean UTF-8.
+ # See bug 2969378 and http://zingermans.com/ for a concrete example.
+ # It's not clear what to do about 16-bit encodings in general.
+UTF8: utf-8, unicode-1-1-utf-8, unicode-2-0-utf-8, x-unicode-2-0-utf-8, utf-16
NonLossyASCII
MacJapanese: x-mac-japanese
@@ -60,6 +69,8 @@ ISOLatin4: iso-8859-4
ISOLatinCyrillic: iso-8859-5
ISOLatinArabic: iso-8859-6
ISOLatinGreek: iso-8859-7
+ # This includes both logical and visual variants of Hebrew.
+ # That's probably not going to work in the real thing.
ISOLatinHebrew: iso-8859-8, iso-8859-8-i, iso-8859-8-e, DOS-862, logical, visual
ISOLatin5: iso-8859-9
ISOLatin6: iso-8859-10
@@ -137,4 +148,6 @@ Big5_HKSCS_1999: big5-hkscs
EBCDIC_US
EBCDIC_CP037: cp037
+ # There doesn't seem to be a kCFStringEncoding constant for this one.
+ # In fact, I got this value from Mail source code, and I'm not sure how it works.
0xAFE: japanese-autodetect
diff --git a/WebCore/kwq/make-charset-table.pl b/WebCore/kwq/make-charset-table.pl
index a7b99b9..f23c2b6 100755
--- a/WebCore/kwq/make-charset-table.pl
+++ b/WebCore/kwq/make-charset-table.pl
@@ -44,6 +44,8 @@ sub process_mac_encodings
while (<MAC_ENCODINGS>) {
chomp;
+ s/\#.*$//;
+ s/\s+$//;
if (my ($MacName, $IANANames) = /(.*): (.*)/) {
my %aliases;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list