<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204113] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204113">204113</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-03 22:09:18 -0700 (Wed, 03 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop legacy Document.defaultCharset attribute
https://bugs.webkit.org/show_bug.cgi?id=160536
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
Rebaseline W3C test now that one more check is passing.
* web-platform-tests/dom/historical-expected.txt:
Source/WebCore:
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:
LayoutTests:
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomDocumentdocumentcharsetexpectedtxt">trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomDocumentdocumentcharsethtml">trunk/LayoutTests/fast/dom/Document/document-charset.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsdomhistoricalexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMDocumentmm">trunk/Source/WebCore/bindings/objc/DOMDocument.mm</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastframesdetachedframedocumentdefaultCharsetexpectedtxt">trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastframesdetachedframedocumentdefaultCharsethtml">trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-04 03:43:51 UTC (rev 204112)
+++ trunk/LayoutTests/ChangeLog 2016-08-04 05:09:18 UTC (rev 204113)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-08-03 Chris Dumez <cdumez@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-08-03 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking media/track/track-in-band-cues-added-once.html as flaky on ios-simulator.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDocumentdocumentcharsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,8 +2,6 @@
</span><span class="cx">
</span><span class="cx"> document.charset: KOI8-R
</span><span class="cx">
</span><del>- document.defaultCharset: defined
-
</del><span class="cx"> document.characterSet: KOI8-R
</span><span class="cx">
</span><span class="cx"> document.inputEncoding: KOI8-R
</span><span class="lines">@@ -12,8 +10,6 @@
</span><span class="cx">
</span><span class="cx"> document.charset: KOI8-R
</span><span class="cx">
</span><del>- document.defaultCharset: defined
-
</del><span class="cx"> document.characterSet: KOI8-R
</span><span class="cx">
</span><span class="cx"> document.inputEncoding: KOI8-R
</span><span class="lines">@@ -22,8 +18,6 @@
</span><span class="cx">
</span><span class="cx"> document.charset: KOI8-R
</span><span class="cx">
</span><del>- document.defaultCharset: defined
-
</del><span class="cx"> document.characterSet: KOI8-R
</span><span class="cx">
</span><span class="cx"> document.inputEncoding: KOI8-R
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomDocumentdocumentcharsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Document/document-charset.html (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx">
</span><span class="cx"> document.write("<p>Initial</p>");
</span><span class="cx"> document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
</span><del>-document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
</del><span class="cx"> document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
</span><span class="cx"> document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>");
</span><span class="cx">
</span><span class="lines">@@ -19,7 +18,6 @@
</span><span class="cx"> try {
</span><span class="cx"> document.charset = "utf-8";
</span><span class="cx"> document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
</span><del>- document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
</del><span class="cx"> document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
</span><span class="cx"> document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>");
</span><span class="cx"> } catch (ex) {
</span><span class="lines">@@ -30,7 +28,6 @@
</span><span class="cx"> try {
</span><span class="cx"> document.characterSet = "utf-8";
</span><span class="cx"> document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
</span><del>- document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
</del><span class="cx"> document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
</span><span class="cx"> document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>");
</span><span class="cx"> } catch (ex) {
</span></span></pre></div>
<a id="trunkLayoutTestsfastframesdetachedframedocumentdefaultCharsetexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset-expected.txt (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastframesdetachedframedocumentdefaultCharsethtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/frames/detached-frame-document-defaultCharset.html (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-<script src="../../resources/js-test-pre.js"></script>
-<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="about:blank"></iframe>
-<script src="../../resources/js-test-post.js"></script>
</del></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-08-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ 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 <cdumez@apple.com>
+
</ins><span class="cx"> Fix logging in W3C tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160513
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsdomhistoricalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/dom/historical-expected.txt (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> PASS Historical DOM features must be removed: domConfig
</span><span class="cx"> PASS Historical DOM features must be removed: normalizeDocument
</span><span class="cx"> PASS Historical DOM features must be removed: renameNode
</span><del>-FAIL Historical DOM features must be removed: defaultCharset assert_equals: expected (undefined) undefined but got (string) "ISO-8859-1"
</del><ins>+PASS Historical DOM features must be removed: defaultCharset
</ins><span class="cx"> PASS Historical DOM features must be removed: height
</span><span class="cx"> PASS Historical DOM features must be removed: width
</span><span class="cx"> PASS DOMImplementation.getFeature() must be nuked.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-08-03 Chris Dumez <cdumez@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-08-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some unneeded #ifs now that the Objective-C bindings are frozen
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMDocumentmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMDocument.mm (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> - (NSString *)defaultCharset
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return IMPL->defaultCharset();
</del><ins>+ return IMPL->defaultCharsetForBindings();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)readyState
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1340,7 +1340,7 @@
</span><span class="cx"> return UTF8Encoding().domName();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Document::defaultCharset() const
</del><ins>+String Document::defaultCharsetForBindings() const
</ins><span class="cx"> {
</span><span class="cx"> if (Settings* settings = this->settings())
</span><span class="cx"> return settings->defaultTextEncodingName();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx">
</span><span class="cx"> String readyState() const;
</span><span class="cx">
</span><del>- String defaultCharset() const;
</del><ins>+ String defaultCharsetForBindings() const;
</ins><span class="cx">
</span><span class="cx"> String charset() const { return Document::encoding(); }
</span><span class="cx"> String characterSetWithUTF8Fallback() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (204112 => 204113)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -193,7 +193,6 @@
</span><span class="cx"> #else
</span><span class="cx"> [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString charset;
</span><span class="cx"> #endif
</span><del>- readonly attribute DOMString defaultCharset;
</del><span class="cx"> readonly attribute DOMString readyState;
</span><span class="cx">
</span><span class="cx"> Element elementFromPoint(optional long x = 0, optional long y = 0);
</span></span></pre>
</div>
</div>
</body>
</html>