[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:47:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7a8b41faac571863fe081a9bea4b18c1318e79a3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 15 04:18:49 2003 +0000
Reviewed by Maciej.
- fixed 3244447 -- add KOI8-U charset support
- fixed 3327152 -- unicodeFFFE and unicodeFEFF are handled backwards by WebCore
- fixed 3327157 -- x-mac-ukrainian should be mapped to MacCyrillic
- fixed 3327160 -- shift-jis, shift_jis, x-sjis should be mapped to the DOS variant of Shift JIS
- fixed 3327162 -- most Simplified Chinese encoding choices should be mapped to the DOS variant of EUC-CN
- fixed 3327166 -- use DOS variant of EUC_KR
* kwq/KWQCharsets.mm: Added some defines so we could use encodings that don't
have any kCFStringEncoding constant in a header file.
* kwq/mac-encodings.txt: Change table entries in accordance with the above bug reports.
* kwq/KWQCharsetData.c: Regenerated.
- other changes, inspired by investigation of various bugs
* kwq/KWQButton.mm: (-[KWQButton sendConsumedMouseUpIfNeeded]): Make robust against cases where
sending the consumed mouse up event destroys the QButton.
* khtml/html/htmlparser.cpp:
(KHTMLParser::reopenResidualStyleTags): Rearrange code slightly for clarity, added comment.
(KHTMLParser::freeBlock): Removed unnecessary line of code.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4655 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index de75bd9..3ade1c3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,28 @@
+2003-07-14 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3244447 -- add KOI8-U charset support
+ - fixed 3327152 -- unicodeFFFE and unicodeFEFF are handled backwards by WebCore
+ - fixed 3327157 -- x-mac-ukrainian should be mapped to MacCyrillic
+ - fixed 3327160 -- shift-jis, shift_jis, x-sjis should be mapped to the DOS variant of Shift JIS
+ - fixed 3327162 -- most Simplified Chinese encoding choices should be mapped to the DOS variant of EUC-CN
+ - fixed 3327166 -- use DOS variant of EUC_KR
+
+ * kwq/KWQCharsets.mm: Added some defines so we could use encodings that don't
+ have any kCFStringEncoding constant in a header file.
+ * kwq/mac-encodings.txt: Change table entries in accordance with the above bug reports.
+ * kwq/KWQCharsetData.c: Regenerated.
+
+ - other changes, inspired by investigation of various bugs
+
+ * kwq/KWQButton.mm: (-[KWQButton sendConsumedMouseUpIfNeeded]): Make robust against cases where
+ sending the consumed mouse up event destroys the QButton.
+
+ * khtml/html/htmlparser.cpp:
+ (KHTMLParser::reopenResidualStyleTags): Rearrange code slightly for clarity, added comment.
+ (KHTMLParser::freeBlock): Removed unnecessary line of code.
+
2003-07-14 Dave Hyatt <hyatt at apple.com>
Fix for 3294626, no scrollbar on ESPN. Fix lowestPosition to
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index de75bd9..3ade1c3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,28 @@
+2003-07-14 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3244447 -- add KOI8-U charset support
+ - fixed 3327152 -- unicodeFFFE and unicodeFEFF are handled backwards by WebCore
+ - fixed 3327157 -- x-mac-ukrainian should be mapped to MacCyrillic
+ - fixed 3327160 -- shift-jis, shift_jis, x-sjis should be mapped to the DOS variant of Shift JIS
+ - fixed 3327162 -- most Simplified Chinese encoding choices should be mapped to the DOS variant of EUC-CN
+ - fixed 3327166 -- use DOS variant of EUC_KR
+
+ * kwq/KWQCharsets.mm: Added some defines so we could use encodings that don't
+ have any kCFStringEncoding constant in a header file.
+ * kwq/mac-encodings.txt: Change table entries in accordance with the above bug reports.
+ * kwq/KWQCharsetData.c: Regenerated.
+
+ - other changes, inspired by investigation of various bugs
+
+ * kwq/KWQButton.mm: (-[KWQButton sendConsumedMouseUpIfNeeded]): Make robust against cases where
+ sending the consumed mouse up event destroys the QButton.
+
+ * khtml/html/htmlparser.cpp:
+ (KHTMLParser::reopenResidualStyleTags): Rearrange code slightly for clarity, added comment.
+ (KHTMLParser::freeBlock): Removed unnecessary line of code.
+
2003-07-14 Dave Hyatt <hyatt at apple.com>
Fix for 3294626, no scrollbar on ESPN. Fix lowestPosition to
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index d32614a..219ac3d 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1370,18 +1370,15 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, bool inMalformedTable)
{
- // Nothing required.
- if (!elem)
- return;
-
- // We have some tags that need to be reopened.
- int exceptionCode = 0;
+ // Loop for each tag that needs to be reopened.
while (elem) {
// Create a shallow clone of the DOM node for this element.
NodeImpl* newNode = elem->node->cloneNode(false);
// Append the new node.
+ int exceptionCode = 0;
current->appendChild(newNode, exceptionCode);
+ // FIXME: Is it really OK to ignore the exception here?
// Now push a new stack element for this node we just created.
pushBlock(elem->id, elem->level);
@@ -1549,7 +1546,6 @@ void KHTMLParser::freeBlock()
{
while (blockStack)
popOneBlock();
- blockStack = 0;
}
void KHTMLParser::createHead()
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index a7b7221..eda0722 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -42,7 +42,6 @@
@implementation KWQButton
-
- (id)initWithQButton:(QButton *)b
{
button = b;
@@ -58,7 +57,9 @@
{
if (needToSendConsumedMouseUp) {
needToSendConsumedMouseUp = NO;
- button->sendConsumedMouseUp();
+ if ([self target]) {
+ button->sendConsumedMouseUp();
+ }
}
}
@@ -69,7 +70,6 @@
[self sendConsumedMouseUpIfNeeded];
}
-
@end
QButton::QButton()
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index 3dd5a88..c7ed4ff 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -34,9 +34,9 @@ static const CharsetEntry table[] = {
{ "unicode", kCFStringEncodingUnicode, NoEncodingFlags },
{ "utf16", kCFStringEncodingUnicode, NoEncodingFlags },
{ "UTF-16BE", kCFStringEncodingUnicode, BigEndian },
- { "unicodefeff", kCFStringEncodingUnicode, BigEndian },
+ { "unicodefffe", kCFStringEncodingUnicode, BigEndian },
{ "UTF-16LE", kCFStringEncodingUnicode, LittleEndian },
- { "unicodefffe", kCFStringEncodingUnicode, LittleEndian },
+ { "unicodefeff", kCFStringEncodingUnicode, LittleEndian },
{ "UTF-8", kCFStringEncodingUTF8, NoEncodingFlags },
{ "unicode11utf8", kCFStringEncodingUTF8, NoEncodingFlags },
{ "unicode20utf8", kCFStringEncodingUTF8, NoEncodingFlags },
@@ -49,6 +49,7 @@ static const CharsetEntry table[] = {
{ "x-mac-hebrew", kCFStringEncodingMacHebrew, NoEncodingFlags },
{ "x-mac-greek", kCFStringEncodingMacGreek, NoEncodingFlags },
{ "x-mac-cyrillic", kCFStringEncodingMacCyrillic, NoEncodingFlags },
+ { "xmacukrainian", kCFStringEncodingMacCyrillic, NoEncodingFlags },
{ "x-mac-devanagari", kCFStringEncodingMacDevanagari, NoEncodingFlags },
{ "x-mac-gurmukhi", kCFStringEncodingMacGurmukhi, NoEncodingFlags },
{ "x-mac-gujarati", kCFStringEncodingMacGujarati, NoEncodingFlags },
@@ -65,7 +66,6 @@ static const CharsetEntry table[] = {
{ "x-mac-icelandic", kCFStringEncodingMacIcelandic, NoEncodingFlags },
{ "x-mac-romanian", kCFStringEncodingMacRomanian, NoEncodingFlags },
{ "x-mac-farsi", kCFStringEncodingMacFarsi, NoEncodingFlags },
- { "x-mac-ukrainian", kCFStringEncodingMacUkrainian, NoEncodingFlags },
{ "x-mac-vt100", kCFStringEncodingMacVT100, NoEncodingFlags },
{ "ISO-8859-2", kCFStringEncodingISOLatin2, NoEncodingFlags },
{ "csisolatin2", kCFStringEncodingISOLatin2, NoEncodingFlags },
@@ -230,27 +230,7 @@ static const CharsetEntry table[] = {
{ "JIS_C6226-1978", kCFStringEncodingJIS_C6226_78, IsJapanese },
{ "csiso42jisc62261978", kCFStringEncodingJIS_C6226_78, IsJapanese },
{ "isoir42", kCFStringEncodingJIS_C6226_78, IsJapanese },
- { "Shift_JIS", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
- { "csshiftjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
- { "mskanji", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
- { "sjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
- { "xsjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
{ "GB18030", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "chinese", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "cngb", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "cp936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "csgb2312", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "csgb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "csiso58gb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "euccn", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "gb2312", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "gb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "gbk", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "isoir58", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "ms936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "windows936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "xeuccn", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
- { "xgbk", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
{ "ISO-2022-JP", kCFStringEncodingISO_2022_JP, IsJapanese },
{ "csiso2022jp", kCFStringEncodingISO_2022_JP, IsJapanese },
{ "jis7", kCFStringEncodingISO_2022_JP, IsJapanese },
@@ -267,16 +247,36 @@ static const CharsetEntry table[] = {
{ "extendedunixcodepackedformatforjapanese", kCFStringEncodingEUC_JP, IsJapanese },
{ "xeuc", kCFStringEncodingEUC_JP, IsJapanese },
{ "xeucjp", kCFStringEncodingEUC_JP, IsJapanese },
+ { "EUC-CN", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "chinese", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "cngb", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "cp936", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "csgb2312", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "csgb231280", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "csiso58gb231280", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "gb2312", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "gb231280", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "gbk", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "isoir58", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "ms936", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "windows936", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "xeuccn", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
+ { "xgbk", kCFStringEncodingEUC_CN_DOSVariant, NoEncodingFlags },
{ "EUC-TW", kCFStringEncodingEUC_TW, NoEncodingFlags },
- { "EUC-KR", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "cp949", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "cseuckr", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "csksc56011987", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "isoir149", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "korean", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "ksc5601", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "ksc56011987", kCFStringEncodingEUC_KR, NoEncodingFlags },
- { "ksc56011989", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "EUC-KR", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "cp949", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "cseuckr", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "csksc56011987", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "isoir149", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "korean", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "ksc5601", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "ksc56011987", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "ksc56011989", kCFStringEncodingEUC_KR_DOSVariant, NoEncodingFlags },
+ { "Shift_JIS", kCFStringEncodingShiftJIS_DOSVariant, IsJapanese },
+ { "csshiftjis", kCFStringEncodingShiftJIS_DOSVariant, IsJapanese },
+ { "mskanji", kCFStringEncodingShiftJIS_DOSVariant, IsJapanese },
+ { "sjis", kCFStringEncodingShiftJIS_DOSVariant, IsJapanese },
+ { "xsjis", kCFStringEncodingShiftJIS_DOSVariant, IsJapanese },
{ "KOI8-R", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "cskoi8r", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "koi", kCFStringEncodingKOI8_R, NoEncodingFlags },
@@ -288,6 +288,7 @@ static const CharsetEntry table[] = {
{ "cnbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
{ "csbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
{ "xxbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "KOI8-U", kCFStringEncodingKOI8_U, NoEncodingFlags },
{ "cp037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
{ "csibm037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
{ "ebcdiccpca", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
diff --git a/WebCore/kwq/KWQCharsets.mm b/WebCore/kwq/KWQCharsets.mm
index d1206e2..ea5bf76 100644
--- a/WebCore/kwq/KWQCharsets.mm
+++ b/WebCore/kwq/KWQCharsets.mm
@@ -31,7 +31,14 @@ struct CharsetEntry {
KWQEncodingFlags flags;
};
-/* The following autogenerated file includes the charset data. */
+// Until there's a CFString constant for these encodings, this works.
+// Since they are macros, they won't cause a compile failure even a the CFString constant is added.
+#define kCFStringEncodingEUC_CN_DOSVariant (kTextEncodingEUC_CN | (kEUC_CN_DOSVariant << 16))
+#define kCFStringEncodingEUC_KR_DOSVariant (kTextEncodingEUC_KR | (kEUC_KR_DOSVariant << 16))
+#define kCFStringEncodingKOI8_U kTextEncodingKOI8_U
+#define kCFStringEncodingShiftJIS_DOSVariant (kTextEncodingShiftJIS | (kShiftJIS_DOSVariant << 16))
+
+// The following autogenerated file includes the charset data.
#include "KWQCharsetData.c"
static Boolean encodingNamesEqual(const void *value1, const void *value2);
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index f85f4ad..9918b1a 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -9,8 +9,8 @@ ISOLatin1: ISO-8859-1, 88591
NextStepLatin: x-nextstep
ASCII: US-ASCII, isoir6us
Unicode: ISO-10646-UCS-2, ucs2, unicode, utf16
-Unicode, BigEndian: UTF-16BE, unicodefeff
-Unicode, LittleEndian: UTF-16LE, unicodefffe
+Unicode, BigEndian: UTF-16BE, unicodefffe
+Unicode, LittleEndian: UTF-16LE, unicodefeff
UTF8: UTF-8, unicode11utf8, unicode20utf8, xunicode20utf8
NonLossyASCII
@@ -20,7 +20,7 @@ MacKorean: x-mac-korean
MacArabic: x-mac-arabic
MacHebrew: x-mac-hebrew
MacGreek: x-mac-greek
-MacCyrillic: x-mac-cyrillic
+MacCyrillic: x-mac-cyrillic, xmacukrainian
MacDevanagari: x-mac-devanagari
MacGurmukhi: x-mac-gurmukhi
MacGujarati: x-mac-gujarati
@@ -56,7 +56,7 @@ MacGaelic
MacFarsi: x-mac-farsi
-MacUkrainian: x-mac-ukrainian
+MacUkrainian
MacInuit
MacVT100: x-mac-vt100
@@ -112,10 +112,10 @@ JIS_X0208_83, IsJapanese: JIS_X0208-1983
JIS_X0208_90, IsJapanese: JIS_X0208-1990
JIS_X0212_90, IsJapanese: JIS_X0212-1990
JIS_C6226_78, IsJapanese: JIS_C6226-1978
-ShiftJIS_X0213_00, IsJapanese: Shift_JIS, sjis, xsjis
+ShiftJIS_X0213_00, IsJapanese
GB_2312_80
GBK_95
-GB_18030_2000: GB18030, cngb, csgb231280, euccn, gb2312, gb231280, gbk, xeuccn, xgbk
+GB_18030_2000: GB18030
KSC_5601_87
KSC_5601_92_Johab
CNS_11643_92_P1
@@ -131,16 +131,17 @@ ISO_2022_CN_EXT: ISO-2022-CN-EXT
ISO_2022_KR: ISO-2022-KR
EUC_JP, IsJapanese: EUC-JP, xeuc, xeucjp
-EUC_CN
+EUC_CN_DOSVariant: EUC-CN, cngb, csgb231280, gb2312, gb231280, gbk, xeuccn, xgbk
EUC_TW: EUC-TW
-EUC_KR: EUC-KR, cp949, ksc5601
+EUC_KR_DOSVariant: EUC-KR, cp949, ksc5601
-ShiftJIS, IsJapanese
+ShiftJIS_DOSVariant, IsJapanese: Shift_JIS, sjis, xsjis
KOI8_R: KOI8-R, koi, koi8
Big5
MacRomanLatin1: x-mac-roman-latin1
HZ_GB_2312: HZ-GB-2312
Big5_HKSCS_1999: Big5, big5hkscs, cnbig5, xxbig5
+KOI8_U: KOI8-U
EBCDIC_US
EBCDIC_CP037: cp037
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list