<!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>[203761] 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/203761">203761</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 21:27:12 -0700 (Tue, 26 Jul 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move 'dir' attribute from HTMLDocument to Document
https://bugs.webkit.org/show_bug.cgi?id=160231

Reviewed by Sam Weinig.

LayoutTests/imported/w3c:

Rebaseline W3C test now that more checks are passing.

* web-platform-tests/html/dom/interfaces-expected.txt:

Source/WebCore:

Move 'dir' attribute from HTMLDocument to Document to match the
specification:
- https://html.spec.whatwg.org/multipage/dom.html#document

Both Firefox and Chrome have 'dir' on Document already.

No new tests, rebaselined existing test.

* dom/Document.cpp:
(WebCore::Document::dir):
(WebCore::Document::setDir):
* dom/Document.h:
* dom/Document.idl:
* html/HTMLDocument.cpp:
(WebCore::HTMLDocument::dir): Deleted.
(WebCore::HTMLDocument::setDir): Deleted.
* html/HTMLDocument.h:
* html/HTMLDocument.idl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<li><a href="#trunkSourceWebCorehtmlHTMLDocumentcpp">trunk/Source/WebCore/html/HTMLDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDocumenth">trunk/Source/WebCore/html/HTMLDocument.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDocumentidl">trunk/Source/WebCore/html/HTMLDocument.idl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/LayoutTests/imported/w3c/ChangeLog        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-07-26  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Move 'dir' attribute from HTMLDocument to Document
+        https://bugs.webkit.org/show_bug.cgi?id=160231
+
+        Reviewed by Sam Weinig.
+
+        Rebaseline W3C test now that more checks are passing.
+
+        * web-platform-tests/html/dom/interfaces-expected.txt:
+
+2016-07-26  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Second parameter to History.pushState() / replaceState() should be mandatory
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=160230
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> PASS Document interface: attribute lastModified 
</span><span class="cx"> PASS Document interface: attribute readyState 
</span><span class="cx"> PASS Document interface: attribute title 
</span><del>-FAIL Document interface: attribute dir assert_true: The prototype object must have a property &quot;dir&quot; expected true got false
</del><ins>+PASS Document interface: attribute dir 
</ins><span class="cx"> PASS Document interface: attribute body 
</span><span class="cx"> PASS Document interface: attribute head 
</span><span class="cx"> PASS Document interface: attribute images 
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> PASS Document interface: new Document() must inherit property &quot;lastModified&quot; with the proper type (38) 
</span><span class="cx"> PASS Document interface: new Document() must inherit property &quot;readyState&quot; with the proper type (39) 
</span><span class="cx"> PASS Document interface: new Document() must inherit property &quot;title&quot; with the proper type (41) 
</span><del>-FAIL Document interface: new Document() must inherit property &quot;dir&quot; with the proper type (42) assert_inherits: property &quot;dir&quot; not found in prototype chain
</del><ins>+PASS Document interface: new Document() must inherit property &quot;dir&quot; with the proper type (42) 
</ins><span class="cx"> PASS Document interface: new Document() must inherit property &quot;body&quot; with the proper type (43) 
</span><span class="cx"> PASS Document interface: new Document() must inherit property &quot;head&quot; with the proper type (44) 
</span><span class="cx"> PASS Document interface: new Document() must inherit property &quot;images&quot; with the proper type (45) 
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;lastModified&quot; with the proper type (38) 
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;readyState&quot; with the proper type (39) 
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;title&quot; with the proper type (41) 
</span><del>-FAIL Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;dir&quot; with the proper type (42) assert_inherits: property &quot;dir&quot; not found in prototype chain
</del><ins>+PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;dir&quot; with the proper type (42) 
</ins><span class="cx"> PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;body&quot; with the proper type (43) 
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;head&quot; with the proper type (44) 
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, &quot;&quot;, null) must inherit property &quot;images&quot; with the proper type (45) 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/ChangeLog        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-07-26  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Move 'dir' attribute from HTMLDocument to Document
+        https://bugs.webkit.org/show_bug.cgi?id=160231
+
+        Reviewed by Sam Weinig.
+
+        Move 'dir' attribute from HTMLDocument to Document to match the
+        specification:
+        - https://html.spec.whatwg.org/multipage/dom.html#document
+
+        Both Firefox and Chrome have 'dir' on Document already.
+
+        No new tests, rebaselined existing test.
+
+        * dom/Document.cpp:
+        (WebCore::Document::dir):
+        (WebCore::Document::setDir):
+        * dom/Document.h:
+        * dom/Document.idl:
+        * html/HTMLDocument.cpp:
+        (WebCore::HTMLDocument::dir): Deleted.
+        (WebCore::HTMLDocument::setDir): Deleted.
+        * html/HTMLDocument.h:
+        * html/HTMLDocument.idl:
+
+2016-07-26  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Second parameter to History.pushState() / replaceState() should be mandatory
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=160230
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/dom/Document.cpp        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -7085,4 +7085,19 @@
</span><span class="cx">     m_viewportDependentPictures.remove(&amp;picture);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const AtomicString&amp; Document::dir() const
+{
+    auto* documentElement = this-&gt;documentElement();
+    if (!is&lt;HTMLHtmlElement&gt;(documentElement))
+        return nullAtom;
+    return downcast&lt;HTMLHtmlElement&gt;(*documentElement).dir();
+}
+
+void Document::setDir(const AtomicString&amp; value)
+{
+    auto* documentElement = this-&gt;documentElement();
+    if (is&lt;HTMLHtmlElement&gt;(documentElement))
+        downcast&lt;HTMLHtmlElement&gt;(*documentElement).setDir(value);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/dom/Document.h        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -865,6 +865,9 @@
</span><span class="cx">     String title() const { return m_title.string(); }
</span><span class="cx">     void setTitle(const String&amp;, ExceptionCode&amp;);
</span><span class="cx"> 
</span><ins>+    const AtomicString&amp; dir() const;
+    void setDir(const AtomicString&amp;);
+
</ins><span class="cx">     void titleElementAdded(Element&amp; titleElement);
</span><span class="cx">     void titleElementRemoved(Element&amp; titleElement);
</span><span class="cx">     void titleElementTextChanged(Element&amp; titleElement);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/dom/Document.idl        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx">     // Moved down from HTMLDocument
</span><span class="cx"> 
</span><span class="cx">     [SetterRaisesException] attribute DOMString title;
</span><ins>+    attribute DOMString dir;
</ins><span class="cx"> 
</span><span class="cx">     readonly attribute DOMString referrer;
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) &amp;&amp; LANGUAGE_JAVASCRIPT
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.cpp (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.cpp        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/html/HTMLDocument.cpp        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -107,21 +107,6 @@
</span><span class="cx">     return frameView ? frameView-&gt;contentsHeight() : 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-const AtomicString&amp; HTMLDocument::dir() const
-{
-    auto* documentElement = this-&gt;documentElement();
-    if (!is&lt;HTMLHtmlElement&gt;(documentElement))
-        return nullAtom;
-    return downcast&lt;HTMLHtmlElement&gt;(*documentElement).dir();
-}
-
-void HTMLDocument::setDir(const AtomicString&amp; value)
-{
-    auto* documentElement = this-&gt;documentElement();
-    if (is&lt;HTMLHtmlElement&gt;(documentElement))
-        downcast&lt;HTMLHtmlElement&gt;(*documentElement).setDir(value);
-}
-
</del><span class="cx"> String HTMLDocument::designMode() const
</span><span class="cx"> {
</span><span class="cx">     return inDesignMode() ? ASCIILiteral(&quot;on&quot;) : ASCIILiteral(&quot;off&quot;);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.h (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.h        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/html/HTMLDocument.h        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx">     int width();
</span><span class="cx">     int height();
</span><span class="cx"> 
</span><del>-    const AtomicString&amp; dir() const;
-    void setDir(const AtomicString&amp;);
-
</del><span class="cx">     String designMode() const;
</span><span class="cx">     void setDesignMode(const String&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.idl (203760 => 203761)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.idl        2016-07-27 04:12:11 UTC (rev 203760)
+++ trunk/Source/WebCore/html/HTMLDocument.idl        2016-07-27 04:27:12 UTC (rev 203761)
</span><span class="lines">@@ -49,10 +49,9 @@
</span><span class="cx"> #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
</span><span class="cx">     readonly attribute long width;
</span><span class="cx">     readonly attribute long height;
</span><ins>+    attribute DOMString dir;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    attribute DOMString dir;
-
</del><span class="cx">     attribute DOMString designMode;
</span><span class="cx">     readonly attribute DOMString compatMode;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>