Diff
Modified: trunk/LayoutTests/ChangeLog (204112 => 204113)
--- trunk/LayoutTests/ChangeLog 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
@@ -1,3 +1,18 @@
+2016-08-03 Chris Dumez <[email protected]>
+
+ Drop legacy Document.defaultCharset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160536
+
+ Reviewed by Alex Christensen.
+
+ * fast/dom/Document/document-charset-expected.txt:
+ * fast/dom/Document/document-charset.html:
+ Drop defaultCharset checks.
+
+ * fast/frames/detached-frame-document-defaultCharset-expected.txt: Removed.
+ * fast/frames/detached-frame-document-defaultCharset.html: Removed.
+ Drop test that is no longer useful now that we dropped defaultCharset.
+
2016-08-03 Ryan Haddad <[email protected]>
Marking media/track/track-in-band-cues-added-once.html as flaky on ios-simulator.
Modified: trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt (204112 => 204113)
--- trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt 2016-08-04 05:09:18 UTC (rev 204113)
@@ -2,8 +2,6 @@
document.charset: KOI8-R
- document.defaultCharset: defined
-
document.characterSet: KOI8-R
document.inputEncoding: KOI8-R
@@ -12,8 +10,6 @@
document.charset: KOI8-R
- document.defaultCharset: defined
-
document.characterSet: KOI8-R
document.inputEncoding: KOI8-R
@@ -22,8 +18,6 @@
document.charset: KOI8-R
- document.defaultCharset: defined
-
document.characterSet: KOI8-R
document.inputEncoding: KOI8-R
Modified: trunk/LayoutTests/fast/dom/Document/document-charset.html (204112 => 204113)
--- trunk/LayoutTests/fast/dom/Document/document-charset.html 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/fast/dom/Document/document-charset.html 2016-08-04 05:09:18 UTC (rev 204113)
@@ -11,7 +11,6 @@
document.write("<p>Initial</p>");
document.write("<p> document.charset: " + document.charset + "</p>");
-document.write("<p> document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
document.write("<p> document.characterSet: " + document.characterSet + "</p>");
document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>");
@@ -19,7 +18,6 @@
try {
document.charset = "utf-8";
document.write("<p> document.charset: " + document.charset + "</p>");
- document.write("<p> document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
document.write("<p> document.characterSet: " + document.characterSet + "</p>");
document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>");
} catch (ex) {
@@ -30,7 +28,6 @@
try {
document.characterSet = "utf-8";
document.write("<p> document.charset: " + document.charset + "</p>");
- document.write("<p> document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
document.write("<p> document.characterSet: " + document.characterSet + "</p>");
document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>");
} catch (ex) {
Deleted: trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset-expected.txt (204112 => 204113)
--- trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset-expected.txt 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset-expected.txt 2016-08-04 05:09:18 UTC (rev 204113)
@@ -1,13 +0,0 @@
-Tests the value returned by document.defaultCharset before and after its frame is detached.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS childDocument.defaultCharset is "ISO-8859-1"
-Detaching frame.
-PASS childDocument.defaultCharset is "UTF-8"
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset.html (204112 => 204113)
--- trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset.html 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset.html 2016-08-04 05:09:18 UTC (rev 204113)
@@ -1,18 +0,0 @@
-<script src=""
-<script>
-description("Tests the value returned by document.defaultCharset before and after its frame is detached.");
-jsTestIsAsync = true;
-
-_onload_ = function()
-{
- childDocument = frames[0].document;
- shouldBeEqualToString("childDocument.defaultCharset", "ISO-8859-1");
- debug("Detaching frame.");
- document.body.removeChild(document.getElementsByTagName("iframe")[0]);
- shouldBeEqualToString("childDocument.defaultCharset", "UTF-8");
- debug("");
- finishJSTest();
-}
-</script>
-<iframe src=""
-<script src=""
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204112 => 204113)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
@@ -1,5 +1,16 @@
2016-08-03 Chris Dumez <[email protected]>
+ Drop legacy Document.defaultCharset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160536
+
+ Reviewed by Alex Christensen.
+
+ Rebaseline W3C test now that one more check is passing.
+
+ * web-platform-tests/dom/historical-expected.txt:
+
+2016-08-03 Chris Dumez <[email protected]>
+
Fix logging in W3C tests
https://bugs.webkit.org/show_bug.cgi?id=160513
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt (204112 => 204113)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt 2016-08-04 05:09:18 UTC (rev 204113)
@@ -32,7 +32,7 @@
PASS Historical DOM features must be removed: domConfig
PASS Historical DOM features must be removed: normalizeDocument
PASS Historical DOM features must be removed: renameNode
-FAIL Historical DOM features must be removed: defaultCharset assert_equals: expected (undefined) undefined but got (string) "ISO-8859-1"
+PASS Historical DOM features must be removed: defaultCharset
PASS Historical DOM features must be removed: height
PASS Historical DOM features must be removed: width
PASS DOMImplementation.getFeature() must be nuked.
Modified: trunk/Source/WebCore/ChangeLog (204112 => 204113)
--- trunk/Source/WebCore/ChangeLog 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/Source/WebCore/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
@@ -1,3 +1,26 @@
+2016-08-03 Chris Dumez <[email protected]>
+
+ Drop legacy Document.defaultCharset attribute
+ https://bugs.webkit.org/show_bug.cgi?id=160536
+
+ Reviewed by Alex Christensen.
+
+ Drop legacy Document.defaultCharset attribute.
+
+ It is no longer in the specification:
+ - https://dom.spec.whatwg.org/#interface-document
+
+ Firefox and Chrome have already dropped it.
+
+ No new tests, rebaselined existing test.
+
+ * bindings/objc/DOMDocument.mm:
+ (-[DOMDocument defaultCharset]):
+ * dom/Document.cpp:
+ (WebCore::Document::defaultCharsetForBindings):
+ * dom/Document.h:
+ * dom/Document.idl:
+
2016-08-03 Anders Carlsson <[email protected]>
Remove some unneeded #ifs now that the Objective-C bindings are frozen
Modified: trunk/Source/WebCore/bindings/objc/DOMDocument.mm (204112 => 204113)
--- trunk/Source/WebCore/bindings/objc/DOMDocument.mm 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/Source/WebCore/bindings/objc/DOMDocument.mm 2016-08-04 05:09:18 UTC (rev 204113)
@@ -319,7 +319,7 @@
- (NSString *)defaultCharset
{
WebCore::JSMainThreadNullState state;
- return IMPL->defaultCharset();
+ return IMPL->defaultCharsetForBindings();
}
- (NSString *)readyState
Modified: trunk/Source/WebCore/dom/Document.cpp (204112 => 204113)
--- trunk/Source/WebCore/dom/Document.cpp 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-08-04 05:09:18 UTC (rev 204113)
@@ -1340,7 +1340,7 @@
return UTF8Encoding().domName();
}
-String Document::defaultCharset() const
+String Document::defaultCharsetForBindings() const
{
if (Settings* settings = this->settings())
return settings->defaultTextEncodingName();
Modified: trunk/Source/WebCore/dom/Document.h (204112 => 204113)
--- trunk/Source/WebCore/dom/Document.h 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/Source/WebCore/dom/Document.h 2016-08-04 05:09:18 UTC (rev 204113)
@@ -417,7 +417,7 @@
String readyState() const;
- String defaultCharset() const;
+ String defaultCharsetForBindings() const;
String charset() const { return Document::encoding(); }
String characterSetWithUTF8Fallback() const;
Modified: trunk/Source/WebCore/dom/Document.idl (204112 => 204113)
--- trunk/Source/WebCore/dom/Document.idl 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/Source/WebCore/dom/Document.idl 2016-08-04 05:09:18 UTC (rev 204113)
@@ -193,7 +193,6 @@
#else
[ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString charset;
#endif
- readonly attribute DOMString defaultCharset;
readonly attribute DOMString readyState;
Element elementFromPoint(optional long x = 0, optional long y = 0);
