<!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>[204449] 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/204449">204449</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-08-13 15:36:20 -0700 (Sat, 13 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move designMode attribute from HTMLDocument to Document
https://bugs.webkit.org/show_bug.cgi?id=160838
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 designMode attribute from HTMLDocument to Document to match the
latest HTML specification:
- https://html.spec.whatwg.org/multipage/interaction.html#designMode
This also matches Chrome.
No new tests, rebaselined existing test.
* dom/Document.cpp:
(WebCore::Document::designMode):
(WebCore::Document::setDesignMode):
* dom/Document.h:
* dom/Document.idl:
* html/HTMLDocument.cpp:
(WebCore::HTMLDocument::bgColor): Deleted.
(WebCore::HTMLDocument::setBgColor): Deleted.
(WebCore::HTMLDocument::fgColor): 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 (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/LayoutTests/imported/w3c/ChangeLog        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-13 Chris Dumez <cdumez@apple.com>
+
+ Move designMode attribute from HTMLDocument to Document
+ https://bugs.webkit.org/show_bug.cgi?id=160838
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline W3C test now that more checks are passing.
+
+ * web-platform-tests/html/dom/interfaces-expected.txt:
+
</ins><span class="cx"> 2016-08-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> getElementsByTagName() should take a qualifiedName in parameter
</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 (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> PASS Document interface: attribute defaultView
</span><span class="cx"> PASS Document interface: attribute activeElement
</span><span class="cx"> PASS Document interface: operation hasFocus()
</span><del>-FAIL Document interface: attribute designMode assert_true: The prototype object must have a property "designMode" expected true got false
</del><ins>+PASS Document interface: attribute designMode
</ins><span class="cx"> PASS Document interface: operation execCommand(DOMString,boolean,DOMString)
</span><span class="cx"> PASS Document interface: operation queryCommandEnabled(DOMString)
</span><span class="cx"> PASS Document interface: operation queryCommandIndeterm(DOMString)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> PASS Document interface: new Document() must inherit property "defaultView" with the proper type (59)
</span><span class="cx"> PASS Document interface: new Document() must inherit property "activeElement" with the proper type (60)
</span><span class="cx"> PASS Document interface: new Document() must inherit property "hasFocus" with the proper type (61)
</span><del>-FAIL Document interface: new Document() must inherit property "designMode" with the proper type (62) assert_inherits: property "designMode" not found in prototype chain
</del><ins>+PASS Document interface: new Document() must inherit property "designMode" with the proper type (62)
</ins><span class="cx"> PASS Document interface: new Document() must inherit property "execCommand" with the proper type (63)
</span><span class="cx"> PASS Document interface: calling execCommand(DOMString,boolean,DOMString) on new Document() with too few arguments must throw TypeError
</span><span class="cx"> PASS Document interface: new Document() must inherit property "queryCommandEnabled" with the proper type (64)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "defaultView" with the proper type (59)
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "activeElement" with the proper type (60)
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "hasFocus" with the proper type (61)
</span><del>-FAIL Document interface: document.implementation.createDocument(null, "", null) must inherit property "designMode" with the proper type (62) assert_inherits: property "designMode" not found in prototype chain
</del><ins>+PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "designMode" with the proper type (62)
</ins><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "execCommand" with the proper type (63)
</span><span class="cx"> PASS Document interface: calling execCommand(DOMString,boolean,DOMString) on document.implementation.createDocument(null, "", null) with too few arguments must throw TypeError
</span><span class="cx"> PASS Document interface: document.implementation.createDocument(null, "", null) must inherit property "queryCommandEnabled" with the proper type (64)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/ChangeLog        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-08-13 Chris Dumez <cdumez@apple.com>
+
+ Move designMode attribute from HTMLDocument to Document
+ https://bugs.webkit.org/show_bug.cgi?id=160838
+
+ Reviewed by Sam Weinig.
+
+ Move designMode attribute from HTMLDocument to Document to match the
+ latest HTML specification:
+ - https://html.spec.whatwg.org/multipage/interaction.html#designMode
+
+ This also matches Chrome.
+
+ No new tests, rebaselined existing test.
+
+ * dom/Document.cpp:
+ (WebCore::Document::designMode):
+ (WebCore::Document::setDesignMode):
+ * dom/Document.h:
+ * dom/Document.idl:
+ * html/HTMLDocument.cpp:
+ (WebCore::HTMLDocument::bgColor): Deleted.
+ (WebCore::HTMLDocument::setBgColor): Deleted.
+ (WebCore::HTMLDocument::fgColor): Deleted.
+ * html/HTMLDocument.h:
+ * html/HTMLDocument.idl:
+
</ins><span class="cx"> 2016-08-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> getElementsByTagName() should take a qualifiedName in parameter
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/dom/Document.cpp        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -5031,8 +5031,25 @@
</span><span class="cx"> frame->document()->scheduleForcedStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Document::InheritedBool Document::getDesignMode() const
</del><ins>+String Document::designMode() const
</ins><span class="cx"> {
</span><ins>+ return inDesignMode() ? ASCIILiteral("on") : ASCIILiteral("off");
+}
+
+void Document::setDesignMode(const String& value)
+{
+ InheritedBool mode;
+ if (equalLettersIgnoringASCIICase(value, "on"))
+ mode = on;
+ else if (equalLettersIgnoringASCIICase(value, "off"))
+ mode = off;
+ else
+ mode = inherit;
+ setDesignMode(mode);
+}
+
+auto Document::getDesignMode() const -> InheritedBool
+{
</ins><span class="cx"> return m_designMode;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/dom/Document.h        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -941,6 +941,8 @@
</span><span class="cx"> void setDesignMode(InheritedBool value);
</span><span class="cx"> InheritedBool getDesignMode() const;
</span><span class="cx"> bool inDesignMode() const;
</span><ins>+ String designMode() const;
+ void setDesignMode(const String&);
</ins><span class="cx">
</span><span class="cx"> Document* parentDocument() const;
</span><span class="cx"> Document& topDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/dom/Document.idl        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -141,6 +141,7 @@
</span><span class="cx">
</span><span class="cx"> [SetterRaisesException] attribute DOMString title;
</span><span class="cx"> attribute DOMString dir;
</span><ins>+ attribute DOMString designMode;
</ins><span class="cx">
</span><span class="cx"> readonly attribute USVString referrer;
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.cpp (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.cpp        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/html/HTMLDocument.cpp        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -107,23 +107,6 @@
</span><span class="cx"> return frameView ? frameView->contentsHeight() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String HTMLDocument::designMode() const
-{
- return inDesignMode() ? ASCIILiteral("on") : ASCIILiteral("off");
-}
-
-void HTMLDocument::setDesignMode(const String& value)
-{
- InheritedBool mode;
- if (equalLettersIgnoringASCIICase(value, "on"))
- mode = on;
- else if (equalLettersIgnoringASCIICase(value, "off"))
- mode = off;
- else
- mode = inherit;
- Document::setDesignMode(mode);
-}
-
</del><span class="cx"> const AtomicString& HTMLDocument::bgColor() const
</span><span class="cx"> {
</span><span class="cx"> auto* bodyElement = body();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.h (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.h        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/html/HTMLDocument.h        2016-08-13 22:36:20 UTC (rev 204449)
</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>- String designMode() const;
- void setDesignMode(const String&);
-
</del><span class="cx"> const AtomicString& bgColor() const;
</span><span class="cx"> void setBgColor(const String&);
</span><span class="cx"> const AtomicString& fgColor() const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDocument.idl (204448 => 204449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDocument.idl        2016-08-13 20:30:50 UTC (rev 204448)
+++ trunk/Source/WebCore/html/HTMLDocument.idl        2016-08-13 22:36:20 UTC (rev 204449)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> attribute DOMString dir;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- attribute DOMString designMode;
</del><span class="cx"> readonly attribute DOMString compatMode;
</span><span class="cx">
</span><span class="cx"> // Deprecated attributes.
</span></span></pre>
</div>
</div>
</body>
</html>