[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:48:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5564df1048ee690aa2e183f40dbd3175da6d99e2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 23 06:02:25 2003 +0000
WebCore:
Reviewed by Maciej.
- fixed 3108604 -- add Shift JIS X0213 and HK-SCS to the Text Encoding menu
* kwq/mac-encodings.txt: Added "Shift_JIS_X0213-2000". Changed all non-HKSCS
Big5 encodings to use the DOS variant of Big5 as requested by Peter Edberg,
but left Big5-HKSCS alone.
* kwq/KWQCharsets.mm: Added kCFStringEncodingBig5_DOSVariant constant.
* kwq/KWQCharsetData.c: Regenerated.
- fixed 3100151 -- subframes without explicit charset settings should inherit from parent, not use default
* khtml/khtml_part.cpp: (KHTMLPart::write): Get the default encoding from the parent
part, if there is one.
WebBrowser:
Reviewed by Maciej.
- fixed 3108604 -- add Shift JIS X0213 and HK-SCS to the Text Encoding menu
Since Shift JIS X0213 does not yet have an IANA name, had to change the code
to get the name another way. This led me to change the menu items to work by having
the character set name in the representedObject instead of the CFString character set
code in the tag.
* BrowserWindowController.m:
(-[BrowserWindowController validateMenuItem:]): Set the state of a changeTextEncoding:
menu item based on the represented object, not the tag.
(-[BrowserWindowController changeTextEncoding:]): Pass the represented object into
setCustomTextEncodingName: rather than calling CFStringConvertEncodingToIANACharSetName.
* Preferences.subproj/AppearancePreferences.m:
(-[AppearancePreferences updateDefaultCharacterSetPopup]):
(-[AppearancePreferences takeDefaultCharacterSetFrom:]):
* TextEncodingMenu.m: Added both kCFStringEncodingShiftJIS_X0213_00 and
kCFStringEncodingBig5_HKSCS_1999 to the menu.
(-[NSMenu addItemToMenuForEncoding:withTarget:action:]): Get the name using
CFStringConvertEncodingToIANACharSetName, with hardcoded fallbacks for
kCFStringEncodingGB_2312_80 and kCFStringEncodingShiftJIS_X0213_00, which do not have
their IANA names in the table. Put the name in the represented object instead of putting
the encoding constant in the tag. No need for the separatorItemWithNonConflictingTag method
any more, since a character set name of nil does not ever get used (unlike a tag of 0,
which was used for US-ASCII).
(-[NSMenu addStandardTextEncodingMenuItemsWithTarget:action:preferredEncoding:]):
Use the represented object check to detect the end of a group rather than checking the
tag. No need for the separatorItemWithNonConflictingTag method (as above).
* English.lproj/StringsNotToBeLocalized.txt: Updated for this change and other recent changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4689 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d0f3c64..bd2245c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-07-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3108604 -- add Shift JIS X0213 and HK-SCS to the Text Encoding menu
+
+ * kwq/mac-encodings.txt: Added "Shift_JIS_X0213-2000". Changed all non-HKSCS
+ Big5 encodings to use the DOS variant of Big5 as requested by Peter Edberg,
+ but left Big5-HKSCS alone.
+ * kwq/KWQCharsets.mm: Added kCFStringEncodingBig5_DOSVariant constant.
+ * kwq/KWQCharsetData.c: Regenerated.
+
+ - fixed 3100151 -- subframes without explicit charset settings should inherit from parent, not use default
+
+ * khtml/khtml_part.cpp: (KHTMLPart::write): Get the default encoding from the parent
+ part, if there is one.
+
2003-07-22 Dave Hyatt <hyatt at apple.com>
Fix for 3293898, list bullets in ordered lists with an inside list
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d0f3c64..bd2245c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-07-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed 3108604 -- add Shift JIS X0213 and HK-SCS to the Text Encoding menu
+
+ * kwq/mac-encodings.txt: Added "Shift_JIS_X0213-2000". Changed all non-HKSCS
+ Big5 encodings to use the DOS variant of Big5 as requested by Peter Edberg,
+ but left Big5-HKSCS alone.
+ * kwq/KWQCharsets.mm: Added kCFStringEncodingBig5_DOSVariant constant.
+ * kwq/KWQCharsetData.c: Regenerated.
+
+ - fixed 3100151 -- subframes without explicit charset settings should inherit from parent, not use default
+
+ * khtml/khtml_part.cpp: (KHTMLPart::write): Get the default encoding from the parent
+ part, if there is one.
+
2003-07-22 Dave Hyatt <hyatt at apple.com>
Fix for 3293898, list bullets in ordered lists with an inside list
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 90eb700..fc6ca93 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1505,8 +1505,12 @@ void KHTMLPart::write( const char *str, int len )
if (!d->m_encoding.isNull())
d->m_decoder->setEncoding(d->m_encoding.latin1(),
d->m_haveEncoding ? Decoder::UserChosenEncoding : Decoder::EncodingFromHTTPHeader);
- else
- d->m_decoder->setEncoding(settings()->encoding().latin1(), Decoder::DefaultEncoding);
+ else {
+ // Inherit the default encoding from the parent frame if there is one.
+ const char *defaultEncoding = parentPart()
+ ? parentPart()->d->m_decoder->encoding() : settings()->encoding().latin1();
+ d->m_decoder->setEncoding(defaultEncoding, Decoder::DefaultEncoding);
+ }
#if APPLE_CHANGES
if (d->m_doc)
d->m_doc->setDecoder(d->m_decoder);
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index c7ed4ff..a5a3c81 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -230,6 +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_X0213-2000", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
{ "GB18030", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
{ "ISO-2022-JP", kCFStringEncodingISO_2022_JP, IsJapanese },
{ "csiso2022jp", kCFStringEncodingISO_2022_JP, IsJapanese },
@@ -281,13 +282,13 @@ static const CharsetEntry table[] = {
{ "cskoi8r", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "koi", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "koi8", kCFStringEncodingKOI8_R, NoEncodingFlags },
+ { "Big5", kCFStringEncodingBig5_DOSVariant, NoEncodingFlags },
+ { "cnbig5", kCFStringEncodingBig5_DOSVariant, NoEncodingFlags },
+ { "csbig5", kCFStringEncodingBig5_DOSVariant, NoEncodingFlags },
+ { "xxbig5", kCFStringEncodingBig5_DOSVariant, NoEncodingFlags },
{ "x-mac-roman-latin1", kCFStringEncodingMacRomanLatin1, NoEncodingFlags },
{ "HZ-GB-2312", kCFStringEncodingHZ_GB_2312, NoEncodingFlags },
- { "Big5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "big5hkscs", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "cnbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "csbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "xxbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "Big5-HKSCS", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
{ "KOI8-U", kCFStringEncodingKOI8_U, NoEncodingFlags },
{ "cp037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
{ "csibm037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
diff --git a/WebCore/kwq/KWQCharsets.mm b/WebCore/kwq/KWQCharsets.mm
index ea5bf76..541fdd1 100644
--- a/WebCore/kwq/KWQCharsets.mm
+++ b/WebCore/kwq/KWQCharsets.mm
@@ -33,6 +33,7 @@ struct CharsetEntry {
// 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 kCFStringEncodingBig5_DOSVariant (kTextEncodingBig5 | (kBig5_DOSVariant << 16))
#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
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 9918b1a..e6bfecb 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -112,7 +112,7 @@ 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
+ShiftJIS_X0213_00, IsJapanese: Shift_JIS_X0213-2000
GB_2312_80
GBK_95
GB_18030_2000: GB18030
@@ -137,10 +137,10 @@ EUC_KR_DOSVariant: EUC-KR, cp949, ksc5601
ShiftJIS_DOSVariant, IsJapanese: Shift_JIS, sjis, xsjis
KOI8_R: KOI8-R, koi, koi8
-Big5
+Big5_DOSVariant: Big5, cnbig5, xxbig5
MacRomanLatin1: x-mac-roman-latin1
HZ_GB_2312: HZ-GB-2312
-Big5_HKSCS_1999: Big5, big5hkscs, cnbig5, xxbig5
+Big5_HKSCS_1999: Big5-HKSCS
KOI8_U: KOI8-U
EBCDIC_US
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list