<!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>[205050] 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/205050">205050</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-08-26 14:46:07 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>The :enabled/:disabled selectors should only match elements that can be disabled.
<https://webkit.org/b/161255>
Reviewed by Chris Dumez.
LayoutTests/imported/w3c:
* web-platform-tests/html/semantics/selectors/pseudo-classes/disabled-expected.txt:
Source/WebCore:
Per the HTML spec, only the following elements can be actually disabled:
button, input, select, textarea, optgroup, option, menuitem, fieldset
Since HTMLOutputElement inherits from HTMLFormControlElement, it had some
misguided ideas about being disableable. This was causing it to get matched
by :enabled and :disabled selectors.
Test: imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled.html
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
* css/SelectorCheckerTestFunctions.h:
(WebCore::matchesDisabledPseudoClass):
(WebCore::matchesEnabledPseudoClass): Renamed from isEnabled/isDisabled. Now only allows
:enabled and :disabled selectors to match elements that are actually disableable.
* html/HTMLElement.h:
* html/HTMLElement.cpp:
(WebCore::HTMLElement::canBeActuallyDisabled):
(WebCore::HTMLElement::isActuallyDisabled): Added supporting functions for the aforementioned selectors.
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::parseAttribute): Don't care about disabled state
changes in elements that are not disableable in the first place.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsselectorspseudoclassesdisabledexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckerTestFunctionsh">trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementh">trunk/Source/WebCore/html/HTMLElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-26 Andreas Kling <akling@apple.com>
+
+ The :enabled/:disabled selectors should only match elements that can be disabled.
+ <https://webkit.org/b/161255>
+
+ Reviewed by Chris Dumez.
+
+ * web-platform-tests/html/semantics/selectors/pseudo-classes/disabled-expected.txt:
+
</ins><span class="cx"> 2016-08-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLAreaElement's coords attributes parsing does not comply with the HTML specification
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsselectorspseudoclassesdisabledexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled-expected.txt (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled-expected.txt 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled-expected.txt 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx">
</span><del>-FAIL ':disabled' should match only disabled elements assert_array_equals: lengths differ, expected 9 got 10
-FAIL ':disabled' should not match elements whose disabled attribute has been removed assert_array_equals: lengths differ, expected 8 got 9
-FAIL ':disabled' should also match elements whose disabled attribute has been set assert_array_equals: lengths differ, expected 9 got 10
-FAIL ':disabled' should also match elements whose disabled attribute has been set twice assert_array_equals: lengths differ, expected 9 got 10
-FAIL ':disabled' should also match disabled elements whose type has changed assert_array_equals: lengths differ, expected 9 got 10
-FAIL ':disabled' should not match elements not in the document assert_array_equals: lengths differ, expected 9 got 10
</del><ins>+PASS ':disabled' should match only disabled elements
+PASS ':disabled' should not match elements whose disabled attribute has been removed
+PASS ':disabled' should also match elements whose disabled attribute has been set
+PASS ':disabled' should also match elements whose disabled attribute has been set twice
+PASS ':disabled' should also match disabled elements whose type has changed
+PASS ':disabled' should not match elements not in the document
</ins><span class="cx"> button1 button2
</span><span class="cx"> Name on card:
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-08-26 Andreas Kling <akling@apple.com>
+
+ The :enabled/:disabled selectors should only match elements that can be disabled.
+ <https://webkit.org/b/161255>
+
+ Reviewed by Chris Dumez.
+
+ Per the HTML spec, only the following elements can be actually disabled:
+
+ button, input, select, textarea, optgroup, option, menuitem, fieldset
+
+ Since HTMLOutputElement inherits from HTMLFormControlElement, it had some
+ misguided ideas about being disableable. This was causing it to get matched
+ by :enabled and :disabled selectors.
+
+ Test: imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/disabled.html
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOne):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoClassType):
+ * css/SelectorCheckerTestFunctions.h:
+ (WebCore::matchesDisabledPseudoClass):
+ (WebCore::matchesEnabledPseudoClass): Renamed from isEnabled/isDisabled. Now only allows
+ :enabled and :disabled selectors to match elements that are actually disableable.
+
+ * html/HTMLElement.h:
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::canBeActuallyDisabled):
+ (WebCore::HTMLElement::isActuallyDisabled): Added supporting functions for the aforementioned selectors.
+
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::parseAttribute): Don't care about disabled state
+ changes in elements that are not disableable in the first place.
+
</ins><span class="cx"> 2016-08-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r204028): Fix unused-but-set-variable warning in generated JSNavigator.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -982,13 +982,13 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::PseudoClassEnabled:
</span><del>- return isEnabled(element);
</del><ins>+ return matchesEnabledPseudoClass(element);
</ins><span class="cx"> case CSSSelector::PseudoClassFullPageMedia:
</span><span class="cx"> return isMediaDocument(element);
</span><span class="cx"> case CSSSelector::PseudoClassDefault:
</span><span class="cx"> return matchesDefaultPseudoClass(element);
</span><span class="cx"> case CSSSelector::PseudoClassDisabled:
</span><del>- return isDisabled(element);
</del><ins>+ return matchesDisabledPseudoClass(element);
</ins><span class="cx"> case CSSSelector::PseudoClassReadOnly:
</span><span class="cx"> return matchesReadOnlyPseudoClass(element);
</span><span class="cx"> case CSSSelector::PseudoClassReadWrite:
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerTestFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -51,16 +51,16 @@
</span><span class="cx"> return element.matchesDefaultPseudoClass();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE bool isDisabled(const Element& element)
</del><ins>+// https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
+ALWAYS_INLINE bool matchesDisabledPseudoClass(const Element& element)
</ins><span class="cx"> {
</span><del>- return (is<HTMLFormControlElement>(element) || is<HTMLOptionElement>(element) || is<HTMLOptGroupElement>(element))
- && element.isDisabledFormControl();
</del><ins>+ return is<HTMLElement>(element) && downcast<HTMLElement>(element).isActuallyDisabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE bool isEnabled(const Element& element)
</del><ins>+// https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
+ALWAYS_INLINE bool matchesEnabledPseudoClass(const Element& element)
</ins><span class="cx"> {
</span><del>- return (is<HTMLFormControlElement>(element) || is<HTMLOptionElement>(element) || is<HTMLOptGroupElement>(element))
- && !element.isDisabledFormControl();
</del><ins>+ return is<HTMLElement>(element) && downcast<HTMLElement>(element).canBeActuallyDisabled() && !element.isDisabledFormControl();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -539,10 +539,10 @@
</span><span class="cx"> fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesDefaultPseudoClass));
</span><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx"> case CSSSelector::PseudoClassDisabled:
</span><del>- fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(isDisabled));
</del><ins>+ fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesDisabledPseudoClass));
</ins><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx"> case CSSSelector::PseudoClassEnabled:
</span><del>- fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(isEnabled));
</del><ins>+ fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesEnabledPseudoClass));
</ins><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx"> case CSSSelector::PseudoClassDefined:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -41,12 +41,19 @@
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "HTMLBDIElement.h"
</span><span class="cx"> #include "HTMLBRElement.h"
</span><ins>+#include "HTMLButtonElement.h"
</ins><span class="cx"> #include "HTMLCollection.h"
</span><span class="cx"> #include "HTMLDocument.h"
</span><span class="cx"> #include "HTMLElementFactory.h"
</span><ins>+#include "HTMLFieldSetElement.h"
</ins><span class="cx"> #include "HTMLFormElement.h"
</span><ins>+#include "HTMLInputElement.h"
</ins><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "HTMLOptGroupElement.h"
+#include "HTMLOptionElement.h"
</ins><span class="cx"> #include "HTMLParserIdioms.h"
</span><ins>+#include "HTMLSelectElement.h"
+#include "HTMLTextAreaElement.h"
</ins><span class="cx"> #include "HTMLTextFormControlElement.h"
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="cx"> #include "RenderElement.h"
</span><span class="lines">@@ -1059,6 +1066,22 @@
</span><span class="cx"> return !isDisabledFormControl() && Element::willRespondToMouseClickEvents();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool HTMLElement::canBeActuallyDisabled() const
+{
+ return is<HTMLButtonElement>(*this)
+ || is<HTMLInputElement>(*this)
+ || is<HTMLSelectElement>(*this)
+ || is<HTMLTextAreaElement>(*this)
+ || is<HTMLOptGroupElement>(*this)
+ || is<HTMLOptionElement>(*this)
+ || is<HTMLFieldSetElement>(*this);
+}
+
+bool HTMLElement::isActuallyDisabled() const
+{
+ return canBeActuallyDisabled() && isDisabledFormControl();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.h (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.h 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/html/HTMLElement.h 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -95,6 +95,10 @@
</span><span class="cx">
</span><span class="cx"> static const AtomicString& eventNameForEventHandlerAttribute(const QualifiedName& attributeName);
</span><span class="cx">
</span><ins>+ // Only some element types can be disabled: https://html.spec.whatwg.org/multipage/scripting.html#concept-element-disabled
+ bool canBeActuallyDisabled() const;
+ bool isActuallyDisabled() const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> HTMLElement(const QualifiedName& tagName, Document&, ConstructionType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (205049 => 205050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2016-08-26 21:41:28 UTC (rev 205049)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2016-08-26 21:46:07 UTC (rev 205050)
</span><span class="lines">@@ -146,10 +146,12 @@
</span><span class="cx"> if (name == formAttr)
</span><span class="cx"> formAttributeChanged();
</span><span class="cx"> else if (name == disabledAttr) {
</span><del>- bool oldDisabled = m_disabled;
- m_disabled = !value.isNull();
- if (oldDisabled != m_disabled)
- disabledAttributeChanged();
</del><ins>+ if (canBeActuallyDisabled()) {
+ bool oldDisabled = m_disabled;
+ m_disabled = !value.isNull();
+ if (oldDisabled != m_disabled)
+ disabledAttributeChanged();
+ }
</ins><span class="cx"> } else if (name == readonlyAttr) {
</span><span class="cx"> bool wasReadOnly = m_isReadOnly;
</span><span class="cx"> m_isReadOnly = !value.isNull();
</span></span></pre>
</div>
</div>
</body>
</html>