Modified: trunk/LayoutTests/imported/w3c/ChangeLog (268842 => 268843)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-10-21 22:41:17 UTC (rev 268842)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-10-21 23:09:27 UTC (rev 268843)
@@ -1,3 +1,13 @@
+2020-10-21 Alex Christensen <[email protected]>
+
+ Implement ISO-2022-JP encoder step 3
+ https://bugs.webkit.org/show_bug.cgi?id=218046
+
+ Reviewed by Darin Adler.
+
+ * web-platform-tests/encoding/iso-2022-jp-encoder-expected.txt:
+ * web-platform-tests/encoding/iso-2022-jp-encoder.html:
+
2020-10-21 Chris Dumez <[email protected]>
Make sure WebAudio API throws exceptions with useful error messages
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/iso-2022-jp-encoder-expected.txt (268842 => 268843)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/iso-2022-jp-encoder-expected.txt 2020-10-21 22:41:17 UTC (rev 268842)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/iso-2022-jp-encoder-expected.txt 2020-10-21 23:09:27 UTC (rev 268843)
@@ -1,6 +1,14 @@
PASS iso-2022-jp encoder: very basic
PASS iso-2022-jp encoder: basics
+PASS iso-2022-jp encoder: Katakana
+PASS iso-2022-jp encoder: jis0208
PASS iso-2022-jp encoder: SO/SI ESC
+PASS iso-2022-jp encoder: Roman SO/SI ESC
+PASS iso-2022-jp encoder: Katakana SO/SI ESC
+PASS iso-2022-jp encoder: jis0208 SO/SI ESC
PASS iso-2022-jp encoder: U+FFFD
+PASS iso-2022-jp encoder: Roman U+FFFD
+PASS iso-2022-jp encoder: Katakana U+FFFD
+PASS iso-2022-jp encoder: jis0208 U+FFFD
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/iso-2022-jp-encoder.html (268842 => 268843)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/iso-2022-jp-encoder.html 2020-10-21 22:41:17 UTC (rev 268842)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/encoding/iso-2022-jp-encoder.html 2020-10-21 23:09:27 UTC (rev 268843)
@@ -12,8 +12,16 @@
}, "iso-2022-jp encoder: " + desc)
}
- encode("s", "s", "very basic")
- encode("\u00A5\u203Es\\\uFF90\u4F69", "%1B(J\\~s%1B(B\\%1B$B%_PP%1B(B", "basics")
- encode("\x0E\x0F\x1Bx", "%0E%0F%1Bx", "SO/SI ESC")
+ encode("s", "s", "very basic");
+ encode("\u00A5\u203Es\\\uFF90\u4F69", "%1B(J\\~s%1B(B\\%1B$B%_PP%1B(B", "basics");
+ encode("\uFF61", "%1B$B!%23%1B(B", "Katakana");
+ encode("\u0393", "%1B$B&%23%1B(B", "jis0208");
+ encode("\x0E\x0F\x1Bx", "%26%2365533%3B%26%2365533%3B%26%2365533%3Bx", "SO/SI ESC");
+ encode("\u203E\x0E\x0F\x1Bx", "%1B(J~%26%2365533%3B%26%2365533%3B%26%2365533%3Bx%1B(B", "Roman SO/SI ESC");
+ encode("\uFF61\x0E\x0F\x1Bx", "%1B$B!%23%1B(B%26%2365533%3B%26%2365533%3B%26%2365533%3Bx", "Katakana SO/SI ESC");
+ encode("\u0393\x0E\x0F\x1Bx", "%1B$B&%23%1B(B%26%2365533%3B%26%2365533%3B%26%2365533%3Bx", "jis0208 SO/SI ESC");
encode("\uFFFD", "%26%2365533%3B", "U+FFFD");
+ encode("\u203E\uFFFD", "%1B(J~%26%2365533%3B%1B(B", "Roman U+FFFD");
+ encode("\uFF61\uFFFD", "%1B$B!%23%1B(B%26%2365533%3B", "Katakana U+FFFD");
+ encode("\u0393\uFFFD", "%1B$B&%23%1B(B%26%2365533%3B", "jis0208 U+FFFD");
</script>
Modified: trunk/Source/WebCore/ChangeLog (268842 => 268843)
--- trunk/Source/WebCore/ChangeLog 2020-10-21 22:41:17 UTC (rev 268842)
+++ trunk/Source/WebCore/ChangeLog 2020-10-21 23:09:27 UTC (rev 268843)
@@ -1,3 +1,16 @@
+2020-10-21 Alex Christensen <[email protected]>
+
+ Implement ISO-2022-JP encoder step 3
+ https://bugs.webkit.org/show_bug.cgi?id=218046
+
+ Reviewed by Darin Adler.
+
+ https://encoding.spec.whatwg.org/#iso-2022-jp-encoder step 3 was put in a few years ago and recently implemented by Firefox.
+ Covered by updated and newly passing web platform tests.
+
+ * platform/text/TextCodecCJK.cpp:
+ (WebCore::iso2022JPEncode):
+
2020-10-21 Chris Dumez <[email protected]>
Address post-landing review feedback from Sam Weinig for r268820.
Modified: trunk/Source/WebCore/platform/text/TextCodecCJK.cpp (268842 => 268843)
--- trunk/Source/WebCore/platform/text/TextCodecCJK.cpp 2020-10-21 22:41:17 UTC (rev 268842)
+++ trunk/Source/WebCore/platform/text/TextCodecCJK.cpp 2020-10-21 23:09:27 UTC (rev 268843)
@@ -483,6 +483,10 @@
Function<void(UChar32)> parseCodePoint;
parseCodePoint = [&] (UChar32 codePoint) {
+ if ((state == State::ASCII || state == State::Roman) && (codePoint == 0x000E || codePoint == 0x000F || codePoint == 0x001B)) {
+ statefulUnencodableHandler(replacementCharacter, result);
+ return;
+ }
if (state == State::ASCII && isASCII(codePoint)) {
result.append(codePoint);
return;
