summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 12:38:26 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-08 12:38:26 +0000
commit50f9185a1132aa5727e7e79c1fae7541bdb26da8 (patch)
tree9c1c4c5f4cdded2414bee5e20b5586421b8497bf
parent5590c6f33487b5ed7724466162db56a9d3876d47 (diff)
downloadchromium_src-50f9185a1132aa5727e7e79c1fae7541bdb26da8.zip
chromium_src-50f9185a1132aa5727e7e79c1fae7541bdb26da8.tar.gz
chromium_src-50f9185a1132aa5727e7e79c1fae7541bdb26da8.tar.bz2
Canonical encoding name : windows-949 => EUC-KR
This is the chromium side of a blink change at https://codereview.chromium.org/25870005 Until the corresponding blink CL above is re-landed (it's landed but reverted), disable EUC-KR-related test temporarily. This is a copy of https://codereview.chromium.org/25769005/ (lgtm'd and approved). BUG=277027, 95963 TEST=browser test: BrowserEncodingTest.* and EncodingAlias*. TBR=thakis,robertshield Review URL: https://codereview.chromium.org/26439002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/browser/browser_encoding_browsertest.cc19
-rw-r--r--chrome/browser/character_encoding.cc3
-rw-r--r--chrome/test/data/encoding_tests/alias_mapping/EUC-KR.html (renamed from chrome/test/data/encoding_tests/alias_mapping/windows-949.html)4
-rw-r--r--chrome/test/data/encoding_tests/auto_detect/EUC-KR_with_no_encoding_specified.html (renamed from chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html)2
-rw-r--r--chrome/test/data/encoding_tests/auto_detect/expected_results/expected_EUC-KR_saved_from_no_encoding_specified.html (renamed from chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html)6
-rw-r--r--chrome_frame/chrome_active_document.h2
6 files changed, 22 insertions, 14 deletions
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc
index e4911db..eadbfec 100644
--- a/chrome/browser/browser_encoding_browsertest.cc
+++ b/chrome/browser/browser_encoding_browsertest.cc
@@ -53,8 +53,12 @@ const EncodingTestData kEncodingTestDatas[] = {
{ "UTF-8.html", "UTF-8" },
{ "UTF-16LE.html", "UTF-16LE" },
{ "windows-874.html", "windows-874" },
- // http://crbug.com/95963
- // { "windows-949.html", "windows-949" },
+#if 0
+ // TODO(jungshik): Temporarily disable this. Reenable it once
+ // Blink rolls to include https://codereview.chromium.org/25870005/
+ // (it's reverted so that it has to be landed again).
+ { "EUC-KR.html", "EUC-KR" },
+#endif
{ "windows-1250.html", "windows-1250" },
{ "windows-1251.html", "windows-1251" },
{ "windows-1252.html", "windows-1252" },
@@ -265,9 +269,14 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) {
{ "UTF-8_with_no_encoding_specified.html",
"expected_UTF-8_saved_from_no_encoding_specified.html",
"UTF-8" },
- { "windows-949_with_no_encoding_specified.html",
- "expected_windows-949_saved_from_no_encoding_specified.html",
- "windows-949-2000" },
+#if 0
+ // TODO(jungshik): Temporarily disable this. Reenable it once
+ // Blink rolls to include https://codereview.chromium.org/25870005/
+ // (it's reverted so that it has to be landed again).
+ { "EUC-KR_with_no_encoding_specified.html",
+ "expected_EUC-KR_saved_from_no_encoding_specified.html",
+ "EUC-KR" },
+#endif
{ "windows-1251_with_no_encoding_specified.html",
"expected_windows-1251_saved_from_no_encoding_specified.html",
"windows-1251" },
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc
index 4909a7b..7c8fef0 100644
--- a/chrome/browser/character_encoding.cc
+++ b/chrome/browser/character_encoding.cc
@@ -42,7 +42,7 @@ const CanonicalEncodingData kCanonicalEncodingNames[] = {
{ IDC_ENCODING_GB18030, "gb18030", IDS_ENCODING_SIMP_CHINESE },
{ IDC_ENCODING_BIG5, "Big5", IDS_ENCODING_TRAD_CHINESE },
{ IDC_ENCODING_BIG5HKSCS, "Big5-HKSCS", IDS_ENCODING_TRAD_CHINESE },
- { IDC_ENCODING_KOREAN, "windows-949", IDS_ENCODING_KOREAN },
+ { IDC_ENCODING_KOREAN, "EUC-KR", IDS_ENCODING_KOREAN },
{ IDC_ENCODING_SHIFTJIS, "Shift_JIS", IDS_ENCODING_JAPANESE },
{ IDC_ENCODING_EUCJP, "EUC-JP", IDS_ENCODING_JAPANESE },
{ IDC_ENCODING_ISO2022JP, "ISO-2022-JP", IDS_ENCODING_JAPANESE },
@@ -88,7 +88,6 @@ const CanonicalEncodingDisplayNamePair kCanonicalDisplayNameOverrides[] = {
// Only lists the canonical names where we want a different form for display.
{ "macintosh", "Macintosh" },
{ "windows-874", "Windows-874" },
- { "windows-949", "Windows-949" },
{ "windows-1250", "Windows-1250" },
{ "windows-1251", "Windows-1251" },
{ "windows-1252", "Windows-1252" },
diff --git a/chrome/test/data/encoding_tests/alias_mapping/windows-949.html b/chrome/test/data/encoding_tests/alias_mapping/EUC-KR.html
index ff2f47b..81c9655 100644
--- a/chrome/test/data/encoding_tests/alias_mapping/windows-949.html
+++ b/chrome/test/data/encoding_tests/alias_mapping/EUC-KR.html
@@ -1,7 +1,7 @@
<html>
<head>
- <title> windows-949 </title>
- <meta http-equiv="Content-Type" content="text/html; charset=windows-949" />
+ <title> EUC-KR </title>
+ <meta http-equiv="Content-Type" content="text/html; charset=EUC-KR" />
</head>
<body>
diff --git a/chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html b/chrome/test/data/encoding_tests/auto_detect/EUC-KR_with_no_encoding_specified.html
index 1803f15..1ae000e 100644
--- a/chrome/test/data/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html
+++ b/chrome/test/data/encoding_tests/auto_detect/EUC-KR_with_no_encoding_specified.html
@@ -1,6 +1,6 @@
<html>
<head>
- <title> windows-949 </title>
+ <title> EUC-KR </title>
</head>
<body>
diff --git a/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html b/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_EUC-KR_saved_from_no_encoding_specified.html
index f1351fe..161fac3 100644
--- a/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_windows-949_saved_from_no_encoding_specified.html
+++ b/chrome/test/data/encoding_tests/auto_detect/expected_results/expected_EUC-KR_saved_from_no_encoding_specified.html
@@ -1,7 +1,7 @@
-<!-- saved from url=(0087)http://mock.http/encoding_tests/auto_detect/windows-949_with_no_encoding_specified.html -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-949">
- <title> windows-949 </title>
+<!-- saved from url=(0082)http://mock.http/encoding_tests/auto_detect/EUC-KR_with_no_encoding_specified.html -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=EUC-KR">
+ <title> EUC-KR </title>
</head>
<body>
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index 3afcd0f..9f23b90 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -91,7 +91,7 @@ class ChromeActiveDocument;
V(INTERNAL_IE_ENCODINGMENU_JAPAN_AUTOSELECT, 3634, "ISO-2022-JP") \
V(INTERNAL_IE_ENCODINGMENU_JAPAN_EUC, 3635, "EUC-JP") \
V(INTERNAL_IE_ENCODINGMENU_JAPAN_SHIFT_JIS, 3636, "Shift_JIS") \
- V(INTERNAL_IE_ENCODINGMENU_KOREA, 3637, "windows-949") \
+ V(INTERNAL_IE_ENCODINGMENU_KOREA, 3637, "EUC-KR") \
V(INTERNAL_IE_ENCODINGMENU_THAI, 3638, "windows-874") \
V(INTERNAL_IE_ENCODINGMENU_TURKISH_ISO, 3639, "windows-1254") \
V(INTERNAL_IE_ENCODINGMENU_TURKISH_WINDOWS, 3640, "windows-1254") \
generated by cgit v1.1 at 2025-02-08 08:09:21 +0000