<!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>[202197] 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/202197">202197</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-17 22:53:28 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>:indeterminate pseudo-class should match radios whose group has no checked radio
https://bugs.webkit.org/show_bug.cgi?id=156270
Reviewed by Simon Fraser.
LayoutTests/imported/w3c:
* web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-expected.txt:
One more pass on official tests :)
Source/WebCore:
The pseudo-class ":indeterminate" is supposed to match radio buttons
for which the entire group has no checked button.
Spec: https://html.spec.whatwg.org/#pseudo-classes:selector-indeterminate
The change is straightforward with one non-obvious choice:
I added matchesIndeterminatePseudoClass() in addition to shouldAppearIndeterminate().
The reason is shouldAppearIndeterminate() is used for styling and AX of elements
with an indeterminate states (check boxes and progress element). There is no such
UI for radio boxes.
I could have extended shouldAppearIndeterminate() to radio box
then filter out this case in RenderTheme. The problem is doing that would also requires
changes to the repaint logic to match :indeterminate. It seemed overkill to me to
change repaint() for a case that is never used in practice.
Tests: fast/css/pseudo-indeterminate-radio-buttons-basics.html
fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html
fast/selectors/detached-radio-button-checked-and-indeterminate-states.html
fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html
* css/SelectorCheckerTestFunctions.h:
(WebCore::shouldAppearIndeterminate):
* dom/Element.cpp:
(WebCore::Element::matchesIndeterminatePseudoClass):
* dom/Element.h:
* dom/RadioButtonGroups.cpp:
(WebCore::RadioButtonGroup::setCheckedButton):
(WebCore::RadioButtonGroup::updateCheckedState):
(WebCore::RadioButtonGroup::remove):
(WebCore::RadioButtonGroup::setNeedsStyleRecalcForAllButtons):
(WebCore::RadioButtonGroups::hasCheckedButton):
* dom/RadioButtonGroups.h:
* html/CheckboxInputType.cpp:
(WebCore::CheckboxInputType::matchesIndeterminatePseudoClass):
(WebCore::CheckboxInputType::shouldAppearIndeterminate):
(WebCore::CheckboxInputType::supportsIndeterminateAppearance): Deleted.
* html/CheckboxInputType.h:
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setChecked):
(WebCore::HTMLInputElement::matchesIndeterminatePseudoClass):
(WebCore::HTMLInputElement::shouldAppearIndeterminate):
(WebCore::HTMLInputElement::radioButtonGroups):
* html/HTMLInputElement.h:
* html/InputType.cpp:
(WebCore::InputType::matchesIndeterminatePseudoClass):
(WebCore::InputType::shouldAppearIndeterminate):
(WebCore::InputType::supportsIndeterminateAppearance): Deleted.
* html/InputType.h:
* html/RadioInputType.cpp:
(WebCore::RadioInputType::matchesIndeterminatePseudoClass):
(WebCore::RadioInputType::willDispatchClick): Deleted.
(WebCore::RadioInputType::didDispatchClick): Deleted.
(WebCore::RadioInputType::supportsIndeterminateAppearance): Deleted.
The iOS specific code is just plain wrong.
It was changing the indeterminate state of the input element.
The spec clearly says that state is only used by checkbox:
https://html.spec.whatwg.org/#dom-input-indeterminate
Moreover, the style update would not change the indeterminate state
of other buttons in the Button Group, which is just bizarre.
RenderThemeIOS does not make use of any of this with the current style.
* html/RadioInputType.h:
* style/StyleSharingResolver.cpp:
(WebCore::Style::SharingResolver::canShareStyleWithElement):
(WebCore::Style::canShareStyleWithControl): Deleted.
(WebCore::Style::SharingResolver::sharingCandidateHasIdenticalStyleAffectingAttributes): Deleted.
Style sharing is unified behind the selector matching which is neat.
LayoutTests:
There are two important aspect to cover for this change:
1) The style is updated correctly when a Button Group composition change.
2) When the checkness changes for a Button Group, all its elements
are invalidated to match :indeterminate.
* fast/forms/radio/indeterminate-radio.html:
This test was verifying that the property "indeterminate" of the input element
is not reflected to the style through :indeterminate.
I updated the test to still verify that except that we now match :indeterminate
before changing the property.
* fast/css/pseudo-indeterminate-radio-buttons-basics-expected.html: Added.
* fast/css/pseudo-indeterminate-radio-buttons-basics.html: Added.
* fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation-expected.txt: Added.
* fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html: Added.
Verify that we don't invalidate everything when the checked button changes.
We only need to invalidate everything if the checked state of the whole group changes.
* fast/selectors/detached-radio-button-checked-and-indeterminate-states-expected.txt: Added.
* fast/selectors/detached-radio-button-checked-and-indeterminate-states.html: Added.
* fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update-expected.txt: Added.
* fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformsradioindeterminateradiohtml">trunk/LayoutTests/fast/forms/radio/indeterminate-radio.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsselectorspseudoclassesindeterminateexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-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="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomRadioButtonGroupscpp">trunk/Source/WebCore/dom/RadioButtonGroups.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRadioButtonGroupsh">trunk/Source/WebCore/dom/RadioButtonGroups.h</a></li>
<li><a href="#trunkSourceWebCorehtmlCheckboxInputTypecpp">trunk/Source/WebCore/html/CheckboxInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlCheckboxInputTypeh">trunk/Source/WebCore/html/CheckboxInputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypecpp">trunk/Source/WebCore/html/InputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypeh">trunk/Source/WebCore/html/InputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioInputTypecpp">trunk/Source/WebCore/html/RadioInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioInputTypeh">trunk/Source/WebCore/html/RadioInputType.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleSharingResolvercpp">trunk/Source/WebCore/style/StyleSharingResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsspseudoindeterminateradiobuttonsbasicsexpectedhtml">trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspseudoindeterminateradiobuttonsbasicshtml">trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics.html</a></li>
<li><a href="#trunkLayoutTestsfastcsspseudoindeterminatewithradiobuttonsstyleinvalidationexpectedtxt">trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsspseudoindeterminatewithradiobuttonsstyleinvalidationhtml">trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorsdetachedradiobuttoncheckedandindeterminatestatesexpectedtxt">trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorsdetachedradiobuttoncheckedandindeterminatestateshtml">trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorspseudoindeterminatewithradiobuttonsstyleupdateexpectedtxt">trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorspseudoindeterminatewithradiobuttonsstyleupdatehtml">trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/ios-simulator/imported/w3c/web-platform-tests/html/semantics/selectors/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/LayoutTests/ChangeLog 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-17 Benjamin Poulain <benjamin@webkit.org>
+
+ :indeterminate pseudo-class should match radios whose group has no checked radio
+ https://bugs.webkit.org/show_bug.cgi?id=156270
+
+ Reviewed by Simon Fraser.
+
+ There are two important aspect to cover for this change:
+ 1) The style is updated correctly when a Button Group composition change.
+ 2) When the checkness changes for a Button Group, all its elements
+ are invalidated to match :indeterminate.
+
+ * fast/forms/radio/indeterminate-radio.html:
+ This test was verifying that the property "indeterminate" of the input element
+ is not reflected to the style through :indeterminate.
+ I updated the test to still verify that except that we now match :indeterminate
+ before changing the property.
+
+ * fast/css/pseudo-indeterminate-radio-buttons-basics-expected.html: Added.
+ * fast/css/pseudo-indeterminate-radio-buttons-basics.html: Added.
+
+ * fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation-expected.txt: Added.
+ * fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html: Added.
+ Verify that we don't invalidate everything when the checked button changes.
+ We only need to invalidate everything if the checked state of the whole group changes.
+
+ * fast/selectors/detached-radio-button-checked-and-indeterminate-states-expected.txt: Added.
+ * fast/selectors/detached-radio-button-checked-and-indeterminate-states.html: Added.
+ * fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update-expected.txt: Added.
+ * fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html: Added.
+
</ins><span class="cx"> 2016-06-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202152.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsspseudoindeterminateradiobuttonsbasicsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics-expected.html (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics-expected.html 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,206 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<style>
+ input {
+ background-color: blue;
+ width: 15px;
+ height: 15px;
+ -webkit-appearance: none;
+ }
+ .checked {
+ border: 2px solid red;
+ }
+ .indeterminate {
+ background-color: green;
+ }
+ .disabled {
+ border-left: 3px solid orange;
+ }
+</style>
+</head>
+<body>
+ <div>
+ <input type="radio" class="indeterminate">
+ <input type="radio" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group2" class="indeterminate">
+ <span><input type="radio" name="group2" class="indeterminate"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group6" disabled class="indeterminate disabled">
+ <span><input type="radio" name="group6" disabled class="indeterminate disabled"></span>
+ <input type="radio" name="group7" disabled class="disabled">
+ <input type="radio" name="group7" checked disabled class="disabled">
+ <input type="radio" name="group8" disabled class="disabled">
+ <span><input type="radio" name="group8" checked disabled class="disabled"></span>
+ <input type="radio" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group10" readonly class="indeterminate">
+ <span><input type="radio" name="group10" readonly class="indeterminate"></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </div>
+ <form>
+ <input type="radio" class="indeterminate">
+ <input type="radio" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group2" class="indeterminate">
+ <span><input type="radio" name="group2" class="indeterminate"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked class="checked">
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked class="checked"></span>
+ <input type="radio" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group6" disabled class="indeterminate disabled">
+ <span><input type="radio" name="group6" disabled class="indeterminate disabled"></span>
+ <input type="radio" name="group7" disabled class="disabled">
+ <input type="radio" name="group7" checked disabled class="checked disabled">
+ <input type="radio" name="group8" disabled class="disabled">
+ <span><input type="radio" name="group8" checked disabled class="checked disabled"></span>
+ <input type="radio" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group10" readonly class="indeterminate">
+ <span><input type="radio" name="group10" readonly class="indeterminate"></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly class="checked">
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly class="checked"></span>
+ </form>
+ <form disabled>
+ <input type="radio" class="indeterminate">
+ <input type="radio" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group2" class="indeterminate">
+ <span><input type="radio" name="group2" class="indeterminate"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked class="checked">
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked class="checked"></span>
+ <input type="radio" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group6" disabled class="indeterminate disabled">
+ <span><input type="radio" name="group6" disabled class="indeterminate disabled"></span>
+ <input type="radio" name="group7" disabled class="disabled">
+ <input type="radio" name="group7" checked disabled class="checked disabled">
+ <input type="radio" name="group8" disabled class="disabled">
+ <span><input type="radio" name="group8" checked disabled class="checked disabled"></span>
+ <input type="radio" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group10" readonly class="indeterminate">
+ <span><input type="radio" name="group10" readonly class="indeterminate"></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly class="checked">
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly class="checked"></span>
+ </form>
+ <fieldset disabled class="disabled">
+ <input type="radio" class="indeterminate disabled">
+ <input type="radio" class="indeterminate disabled">
+ <input type="radio" name="group1" class="indeterminate disabled">
+ <input type="radio" name="group1" class="indeterminate disabled">
+ <input type="radio" name="group2" class="indeterminate disabled">
+ <span><input type="radio" name="group2" class="indeterminate disabled"></span>
+ <input type="radio" name="group3" class="disabled">
+ <input type="radio" name="group3" checked class="checked disabled">
+ <input type="radio" name="group4" class="disabled">
+ <span><input type="radio" name="group4" checked class="checked disabled"></span>
+ <input type="radio" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group6" disabled class="indeterminate disabled">
+ <span><input type="radio" name="group6" disabled class="indeterminate disabled"></span>
+ <input type="radio" name="group7" disabled class="disabled">
+ <input type="radio" name="group7" checked disabled class="checked disabled">
+ <input type="radio" name="group8" disabled class="disabled">
+ <span><input type="radio" name="group8" checked disabled class="checked disabled"></span>
+ <input type="radio" readonly class="indeterminate disabled">
+ <input type="radio" name="group9" readonly class="indeterminate disabled">
+ <input type="radio" name="group9" readonly class="indeterminate disabled">
+ <input type="radio" name="group10" readonly class="indeterminate disabled">
+ <span><input type="radio" name="group10" readonly class="indeterminate disabled"></span>
+ <input type="radio" name="group11" readonly class="disabled">
+ <input type="radio" name="group11" checked readonly class="checked disabled">
+ <input type="radio" name="group12" readonly class="disabled">
+ <span><input type="radio" name="group12" checked readonly class="checked disabled"></span>
+ </fieldset>
+ <form>
+ <fieldset disabled class="disabled">
+ <input type="radio" class="indeterminate disabled">
+ <input type="radio" class="indeterminate disabled">
+ <input type="radio" name="group1" class="indeterminate disabled">
+ <input type="radio" name="group1" class="indeterminate disabled">
+ <input type="radio" name="group2" class="indeterminate disabled">
+ <span><input type="radio" name="group2" class="indeterminate disabled"></span>
+ <input type="radio" name="group3" class="disabled">
+ <input type="radio" name="group3" checked class="disabled">
+ <input type="radio" name="group4" class="disabled">
+ <span><input type="radio" name="group4" checked class="disabled"></span>
+ <input type="radio" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group6" disabled class="indeterminate disabled">
+ <span><input type="radio" name="group6" disabled class="indeterminate disabled"></span>
+ <input type="radio" name="group7" disabled class="disabled">
+ <input type="radio" name="group7" checked disabled class="disabled">
+ <input type="radio" name="group8" disabled class="disabled">
+ <span><input type="radio" name="group8" checked disabled class="disabled"></span>
+ <input type="radio" readonly class="indeterminate disabled">
+ <input type="radio" name="group9" readonly class="indeterminate disabled">
+ <input type="radio" name="group9" readonly class="indeterminate disabled">
+ <input type="radio" name="group10" readonly class="indeterminate disabled">
+ <span><input type="radio" name="group10" readonly class="indeterminate disabled"></span>
+ <input type="radio" name="group11" readonly class="disabled">
+ <input type="radio" name="group11" checked readonly class="disabled">
+ <input type="radio" name="group12" readonly class="disabled">
+ <span><input type="radio" name="group12" checked readonly class="disabled"></span>
+ </fieldset>
+ <fieldset>
+ <input type="radio" class="indeterminate">
+ <input type="radio" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group1" class="indeterminate">
+ <input type="radio" name="group2" class="indeterminate">
+ <span><input type="radio" name="group2" class="indeterminate"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked class="checked">
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked class="checked"></span>
+ <input type="radio" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group5" disabled class="indeterminate disabled">
+ <input type="radio" name="group6" disabled class="indeterminate disabled">
+ <span><input type="radio" name="group6" disabled class="indeterminate disabled"></span>
+ <input type="radio" name="group7" disabled class="disabled">
+ <input type="radio" name="group7" checked disabled class="checked disabled">
+ <input type="radio" name="group8" disabled class="disabled">
+ <span><input type="radio" name="group8" checked disabled class="checked disabled"></span>
+ <input type="radio" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group9" readonly class="indeterminate">
+ <input type="radio" name="group10" readonly class="indeterminate">
+ <span><input type="radio" name="group10" readonly class="indeterminate"></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly class="checked">
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly class="checked"></span>
+ </fieldset>
+ </form>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsspseudoindeterminateradiobuttonsbasicshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics.html (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics.html (rev 0)
+++ trunk/LayoutTests/fast/css/pseudo-indeterminate-radio-buttons-basics.html 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,206 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<style>
+ input {
+ background-color: blue;
+ width: 15px;
+ height: 15px;
+ -webkit-appearance: none;
+ }
+ :checked {
+ border: 2px solid red;
+ }
+ :indeterminate {
+ background-color: green;
+ }
+ :disabled {
+ border-left: 3px solid orange;
+ }
+</style>
+</head>
+<body>
+ <div>
+ <input type="radio">
+ <input type="radio">
+ <input type="radio" name="group1">
+ <input type="radio" name="group1">
+ <input type="radio" name="group2">
+ <span><input type="radio" name="group2"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group6" disabled>
+ <span><input type="radio" name="group6" disabled></span>
+ <input type="radio" name="group7" disabled>
+ <input type="radio" name="group7" checked disabled>
+ <input type="radio" name="group8" disabled>
+ <span><input type="radio" name="group8" checked disabled></span>
+ <input type="radio" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group10" readonly>
+ <span><input type="radio" name="group10" readonly></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </div>
+ <form>
+ <input type="radio">
+ <input type="radio">
+ <input type="radio" name="group1">
+ <input type="radio" name="group1">
+ <input type="radio" name="group2">
+ <span><input type="radio" name="group2"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group6" disabled>
+ <span><input type="radio" name="group6" disabled></span>
+ <input type="radio" name="group7" disabled>
+ <input type="radio" name="group7" checked disabled>
+ <input type="radio" name="group8" disabled>
+ <span><input type="radio" name="group8" checked disabled></span>
+ <input type="radio" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group10" readonly>
+ <span><input type="radio" name="group10" readonly></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </form>
+ <form disabled>
+ <input type="radio">
+ <input type="radio">
+ <input type="radio" name="group1">
+ <input type="radio" name="group1">
+ <input type="radio" name="group2">
+ <span><input type="radio" name="group2"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group6" disabled>
+ <span><input type="radio" name="group6" disabled></span>
+ <input type="radio" name="group7" disabled>
+ <input type="radio" name="group7" checked disabled>
+ <input type="radio" name="group8" disabled>
+ <span><input type="radio" name="group8" checked disabled></span>
+ <input type="radio" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group10" readonly>
+ <span><input type="radio" name="group10" readonly></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </form>
+ <fieldset disabled>
+ <input type="radio">
+ <input type="radio">
+ <input type="radio" name="group1">
+ <input type="radio" name="group1">
+ <input type="radio" name="group2">
+ <span><input type="radio" name="group2"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group6" disabled>
+ <span><input type="radio" name="group6" disabled></span>
+ <input type="radio" name="group7" disabled>
+ <input type="radio" name="group7" checked disabled>
+ <input type="radio" name="group8" disabled>
+ <span><input type="radio" name="group8" checked disabled></span>
+ <input type="radio" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group10" readonly>
+ <span><input type="radio" name="group10" readonly></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </fieldset>
+ <form>
+ <fieldset disabled>
+ <input type="radio">
+ <input type="radio">
+ <input type="radio" name="group1">
+ <input type="radio" name="group1">
+ <input type="radio" name="group2">
+ <span><input type="radio" name="group2"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group6" disabled>
+ <span><input type="radio" name="group6" disabled></span>
+ <input type="radio" name="group7" disabled>
+ <input type="radio" name="group7" checked disabled>
+ <input type="radio" name="group8" disabled>
+ <span><input type="radio" name="group8" checked disabled></span>
+ <input type="radio" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group10" readonly>
+ <span><input type="radio" name="group10" readonly></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </fieldset>
+ <fieldset>
+ <input type="radio">
+ <input type="radio">
+ <input type="radio" name="group1">
+ <input type="radio" name="group1">
+ <input type="radio" name="group2">
+ <span><input type="radio" name="group2"></span>
+ <input type="radio" name="group3">
+ <input type="radio" name="group3" checked>
+ <input type="radio" name="group4">
+ <span><input type="radio" name="group4" checked></span>
+ <input type="radio" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group5" disabled>
+ <input type="radio" name="group6" disabled>
+ <span><input type="radio" name="group6" disabled></span>
+ <input type="radio" name="group7" disabled>
+ <input type="radio" name="group7" checked disabled>
+ <input type="radio" name="group8" disabled>
+ <span><input type="radio" name="group8" checked disabled></span>
+ <input type="radio" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group9" readonly>
+ <input type="radio" name="group10" readonly>
+ <span><input type="radio" name="group10" readonly></span>
+ <input type="radio" name="group11" readonly>
+ <input type="radio" name="group11" checked readonly>
+ <input type="radio" name="group12" readonly>
+ <span><input type="radio" name="group12" checked readonly></span>
+ </fieldset>
+ </form>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsspseudoindeterminatewithradiobuttonsstyleinvalidationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation-expected.txt (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation-expected.txt 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+Verify that we do not invalidate more than needed to satisfy :indeterminate
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS elementsNeedingStyleRecalc() is []
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio2", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is []
+Check radio3
+PASS elementsNeedingStyleRecalc() is ["radio1", "radio2", "radio3", "radio4", "radio5"]
+PASS elementsWithIndeterminateStyle() is ["radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio3"]
+Check radio8
+PASS elementsNeedingStyleRecalc() is ["radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS elementsWithIndeterminateStyle() is []
+PASS checkedElements() is ["radio3", "radio8"]
+Check radio4
+PASS elementsNeedingStyleRecalc() is ["radio3", "radio4"]
+PASS elementsWithIndeterminateStyle() is []
+PASS checkedElements() is ["radio4", "radio8"]
+Check radio9
+PASS elementsNeedingStyleRecalc() is ["radio8", "radio9"]
+PASS elementsWithIndeterminateStyle() is []
+PASS checkedElements() is ["radio4", "radio9"]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsspseudoindeterminatewithradiobuttonsstyleinvalidationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html (rev 0)
+++ trunk/LayoutTests/fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,106 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+ input {
+ background-color: rgb(1, 2, 3);
+ }
+ :indeterminate {
+ background-color: rgb(4, 5, 6);
+ }
+</style>
+</head>
+<body>
+ <div id="with-renderer">
+ <!-- With renderer -->
+ <input type="radio" name="group1" id="radio1">
+ <input type="radio" name="group1" id="radio2">
+ <input type="radio" name="group1" id="radio3">
+ <input type="radio" name="group1" id="radio4">
+ <input type="radio" name="group1" id="radio5">
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <input type="radio" name="group2" id="radio6">
+ <input type="radio" name="group2" id="radio7">
+ <input type="radio" name="group2" id="radio8">
+ <input type="radio" name="group2" id="radio9">
+ <input type="radio" name="group2" id="radio10">
+ </div>
+</body>
+<script>
+
+description('Verify that we do not invalidate more than needed to satisfy :indeterminate');
+let allInputs = document.querySelectorAll("input");
+
+function elementsNeedingStyleRecalc() {
+ let elementsRequiringNeedStyleRecalc = []
+ for (let inputElement of allInputs) {
+ let needsStyleRecalc = window.internals.nodeNeedsStyleRecalc(inputElement);
+ if (needsStyleRecalc)
+ elementsRequiringNeedStyleRecalc.push(inputElement.id);
+ }
+ return elementsRequiringNeedStyleRecalc;
+}
+
+function elementsWithIndeterminateStyle() {
+ let elements = [];
+ for (let inputElement of allInputs) {
+ let backgroundColor = getComputedStyle(inputElement).backgroundColor;
+ if (backgroundColor === "rgb(4, 5, 6)")
+ elements.push(inputElement.id);
+ }
+ return elements;
+}
+
+function checkedElements() {
+ let elements = [];
+ for (let inputElement of allInputs) {
+ if (inputElement.checked)
+ elements.push(inputElement.id);
+ }
+ return elements;
+}
+
+// Force a layout to ensure we don't have dirty styles.
+var offsetTop = document.documentElement.offsetTop;
+
+// Initial state.
+shouldBe("elementsNeedingStyleRecalc()", '[]');
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio2", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '[]');
+
+// Check radio3. All the group1 require style recalc.
+debug("Check radio3");
+document.getElementById("radio3").checked = true;
+shouldBe("elementsNeedingStyleRecalc()", '["radio1", "radio2", "radio3", "radio4", "radio5"]');
+shouldBe("elementsWithIndeterminateStyle()", '["radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio3"]');
+
+// Check radio8. All the group1 require style recalc.
+debug("Check radio8");
+document.getElementById("radio8").checked = true;
+shouldBe("elementsNeedingStyleRecalc()", '["radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("elementsWithIndeterminateStyle()", '[]');
+shouldBe("checkedElements()", '["radio3", "radio8"]');
+
+// Checking radio4, we should not need to invalidate anything but the two modified elements.
+debug("Check radio4");
+document.getElementById("radio4").checked = true;
+shouldBe("elementsNeedingStyleRecalc()", '["radio3", "radio4"]');
+shouldBe("elementsWithIndeterminateStyle()", '[]');
+shouldBe("checkedElements()", '["radio4", "radio8"]');
+
+// Checking radio9, we should not need to invalidate anything but the two modified elements.
+debug("Check radio9");
+document.getElementById("radio9").checked = true;
+shouldBe("elementsNeedingStyleRecalc()", '["radio8", "radio9"]');
+shouldBe("elementsWithIndeterminateStyle()", '[]');
+shouldBe("checkedElements()", '["radio4", "radio9"]');
+
+// Hide the elements to make the results prettier.
+document.getElementById("with-renderer").style.display = "none";
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsradioindeterminateradiohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/radio/indeterminate-radio.html (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/radio/indeterminate-radio.html 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/LayoutTests/fast/forms/radio/indeterminate-radio.html 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx"> {
</span><span class="cx"> try
</span><span class="cx"> {
</span><del>-
- document.getElementsByTagName("input")[0].indeterminate = true;
-
</del><span class="cx"> function ArrayContains(array, value, ci)
</span><span class="cx"> {
</span><span class="cx"> ci = ci == true ? true : false;
</span><span class="lines">@@ -46,11 +43,15 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> var target = document.getElementById("test");
</span><span class="cx"> var val = getComputedStyle(target, null).getPropertyValue("color");
</span><del>- var aExpectedValues = new Array("green", "#008000", "rgb(0, 128, 0)");
</del><ins>+ var aExpectedValues = new Array("red", "#FF0000", "rgb(255, 0, 0)");
+ let wasIndeterminate = ArrayContains(aExpectedValues, val, true);
</ins><span class="cx">
</span><del>- if (ArrayContains(aExpectedValues, val, true))
</del><ins>+ document.getElementsByTagName("input")[0].indeterminate = true;
+
+ if (wasIndeterminate && ArrayContains(aExpectedValues, val, true))
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> document.getElementById("testresult").innerHTML = "Pass";
</span><span class="lines">@@ -66,4 +67,4 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsdetachedradiobuttoncheckedandindeterminatestatesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states-expected.txt (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states-expected.txt 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,148 @@
</span><ins>+Verify :indeterminate, :checked and the indeterminate property on radio button detached from the document.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Initial state
+PASS document.getElementById('radio1-in-document').indeterminate is false
+PASS document.getElementById('radio2-in-document').indeterminate is false
+PASS document.getElementById('radio3-in-document').indeterminate is false
+PASS document.getElementById('radio4-in-document').indeterminate is false
+PASS document.getElementById('radio1-in-document').checked is false
+PASS document.getElementById('radio2-in-document').checked is true
+PASS document.getElementById('radio3-in-document').checked is false
+PASS document.getElementById('radio4-in-document').checked is false
+PASS document.getElementById('radio1-in-document').matches(':indeterminate') is false
+PASS document.getElementById('radio2-in-document').matches(':indeterminate') is false
+PASS document.getElementById('radio3-in-document').matches(':indeterminate') is true
+PASS document.getElementById('radio4-in-document').matches(':indeterminate') is true
+PASS document.getElementById('radio1-in-document').matches(':checked') is false
+PASS document.getElementById('radio2-in-document').matches(':checked') is true
+PASS document.getElementById('radio3-in-document').matches(':checked') is false
+PASS document.getElementById('radio4-in-document').matches(':checked') is false
+PASS getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.getElementById('radio2-in-document')).backgroundColor is "rgb(7, 8, 9)"
+PASS getComputedStyle(document.getElementById('radio3-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.getElementById('radio1-in-document')).color is "rgb(4, 5, 6)"
+PASS getComputedStyle(document.getElementById('radio2-in-document')).color is "rgb(4, 5, 6)"
+PASS getComputedStyle(document.getElementById('radio3-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(document.getElementById('radio4-in-document')).color is "rgb(10, 11, 12)"
+Remove radio2-in-document from document, into variable radio2
+PASS document.querySelectorAll('radio2-in-document') is []
+PASS document.getElementById('radio1-in-document').indeterminate is false
+PASS radio2.indeterminate is false
+PASS document.getElementById('radio3-in-document').indeterminate is false
+PASS document.getElementById('radio4-in-document').indeterminate is false
+PASS document.getElementById('radio1-in-document').checked is false
+PASS radio2.checked is true
+PASS document.getElementById('radio3-in-document').checked is false
+PASS document.getElementById('radio4-in-document').checked is false
+PASS document.getElementById('radio1-in-document').matches(':indeterminate') is true
+PASS radio2.matches(':indeterminate') is false
+PASS document.getElementById('radio3-in-document').matches(':indeterminate') is true
+PASS document.getElementById('radio4-in-document').matches(':indeterminate') is true
+PASS document.getElementById('radio1-in-document').matches(':checked') is false
+PASS radio2.matches(':checked') is true
+PASS document.getElementById('radio3-in-document').matches(':checked') is false
+PASS document.getElementById('radio4-in-document').matches(':checked') is false
+PASS getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(radio2).backgroundColor is ""
+PASS getComputedStyle(document.getElementById('radio3-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.getElementById('radio1-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(radio2).color is ""
+PASS getComputedStyle(document.getElementById('radio3-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(document.getElementById('radio4-in-document')).color is "rgb(10, 11, 12)"
+Remove radio3-in-document from document, into variable radio3
+PASS document.querySelectorAll('radio3-in-document') is []
+PASS document.getElementById('radio1-in-document').indeterminate is false
+PASS radio2.indeterminate is false
+PASS radio3.indeterminate is false
+PASS document.getElementById('radio4-in-document').indeterminate is false
+PASS document.getElementById('radio1-in-document').checked is false
+PASS radio2.checked is true
+PASS radio3.checked is false
+PASS document.getElementById('radio4-in-document').checked is false
+PASS document.getElementById('radio1-in-document').matches(':indeterminate') is true
+PASS radio2.matches(':indeterminate') is false
+PASS radio3.matches(':indeterminate') is true
+PASS document.getElementById('radio4-in-document').matches(':indeterminate') is true
+PASS document.getElementById('radio1-in-document').matches(':checked') is false
+PASS radio2.matches(':checked') is true
+PASS radio3.matches(':checked') is false
+PASS document.getElementById('radio4-in-document').matches(':checked') is false
+PASS getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(radio2).backgroundColor is ""
+PASS getComputedStyle(radio3).backgroundColor is ""
+PASS getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.getElementById('radio1-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(radio2).color is ""
+PASS getComputedStyle(radio3).color is ""
+PASS getComputedStyle(document.getElementById('radio4-in-document')).color is "rgb(10, 11, 12)"
+Create new element named webkitRadio
+PASS document.getElementById('radio1-in-document').indeterminate is false
+PASS radio2.indeterminate is false
+PASS radio3.indeterminate is false
+PASS document.getElementById('radio4-in-document').indeterminate is false
+PASS webkitRadio.indeterminate is false
+PASS document.getElementById('radio1-in-document').checked is false
+PASS radio2.checked is true
+PASS radio3.checked is false
+PASS document.getElementById('radio4-in-document').checked is false
+PASS webkitRadio.checked is false
+PASS document.getElementById('radio1-in-document').matches(':indeterminate') is true
+PASS radio2.matches(':indeterminate') is false
+PASS radio3.matches(':indeterminate') is true
+PASS document.getElementById('radio4-in-document').matches(':indeterminate') is true
+PASS webkitRadio.matches(':indeterminate') is true
+PASS document.getElementById('radio1-in-document').matches(':checked') is false
+PASS radio2.matches(':checked') is true
+PASS radio3.matches(':checked') is false
+PASS document.getElementById('radio4-in-document').matches(':checked') is false
+PASS webkitRadio.matches(':checked') is false
+PASS getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(radio2).backgroundColor is ""
+PASS getComputedStyle(radio3).backgroundColor is ""
+PASS getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(webkitRadio).backgroundColor is ""
+PASS getComputedStyle(document.getElementById('radio1-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(radio2).color is ""
+PASS getComputedStyle(radio3).color is ""
+PASS getComputedStyle(document.getElementById('radio4-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(webkitRadio).color is ""
+Check webkitRadio
+PASS document.getElementById('radio1-in-document').indeterminate is false
+PASS radio2.indeterminate is false
+PASS radio3.indeterminate is false
+PASS document.getElementById('radio4-in-document').indeterminate is false
+PASS webkitRadio.indeterminate is false
+PASS document.getElementById('radio1-in-document').checked is false
+PASS radio2.checked is true
+PASS radio3.checked is false
+PASS document.getElementById('radio4-in-document').checked is false
+PASS webkitRadio.checked is true
+PASS document.getElementById('radio1-in-document').matches(':indeterminate') is true
+PASS radio2.matches(':indeterminate') is false
+PASS radio3.matches(':indeterminate') is true
+PASS document.getElementById('radio4-in-document').matches(':indeterminate') is true
+PASS webkitRadio.matches(':indeterminate') is false
+PASS document.getElementById('radio1-in-document').matches(':checked') is false
+PASS radio2.matches(':checked') is true
+PASS radio3.matches(':checked') is false
+PASS document.getElementById('radio4-in-document').matches(':checked') is false
+PASS webkitRadio.matches(':checked') is true
+PASS getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(radio2).backgroundColor is ""
+PASS getComputedStyle(radio3).backgroundColor is ""
+PASS getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(webkitRadio).backgroundColor is ""
+PASS getComputedStyle(document.getElementById('radio1-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(radio2).color is ""
+PASS getComputedStyle(radio3).color is ""
+PASS getComputedStyle(document.getElementById('radio4-in-document')).color is "rgb(10, 11, 12)"
+PASS getComputedStyle(webkitRadio).color is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsdetachedradiobuttoncheckedandindeterminatestateshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states.html (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/detached-radio-button-checked-and-indeterminate-states.html 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,208 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+ input {
+ background-color: rgb(1, 2, 3);
+ color: rgb(4, 5, 6);
+ }
+ :checked {
+ background-color: rgb(7, 8, 9);
+ }
+ :indeterminate {
+ color: rgb(10, 11, 12);
+ }
+</style>
+</head>
+<body>
+ <div id="testcases">
+ <input type="radio" name="group1" id="radio1-in-document">
+ <input type="radio" name="group1" id="radio2-in-document" checked>
+ <input type="radio" name="group2" id="radio3-in-document">
+ <input type="radio" name="group2" id="radio4-in-document">
+ </div>
+</body>
+<script>
+description('Verify :indeterminate, :checked and the indeterminate property on radio button detached from the document.');
+
+debug("Initial state");
+shouldBeFalse("document.getElementById('radio1-in-document').indeterminate");
+shouldBeFalse("document.getElementById('radio2-in-document').indeterminate");
+shouldBeFalse("document.getElementById('radio3-in-document').indeterminate");
+shouldBeFalse("document.getElementById('radio4-in-document').indeterminate");
+
+shouldBeFalse("document.getElementById('radio1-in-document').checked");
+shouldBeTrue("document.getElementById('radio2-in-document').checked");
+shouldBeFalse("document.getElementById('radio3-in-document').checked");
+shouldBeFalse("document.getElementById('radio4-in-document').checked");
+
+shouldBeFalse("document.getElementById('radio1-in-document').matches(':indeterminate')");
+shouldBeFalse("document.getElementById('radio2-in-document').matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio3-in-document').matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio4-in-document').matches(':indeterminate')");
+
+shouldBeFalse("document.getElementById('radio1-in-document').matches(':checked')");
+shouldBeTrue("document.getElementById('radio2-in-document').matches(':checked')");
+shouldBeFalse("document.getElementById('radio3-in-document').matches(':checked')");
+shouldBeFalse("document.getElementById('radio4-in-document').matches(':checked')");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio2-in-document')).backgroundColor", "rgb(7, 8, 9)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio3-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor", "rgb(1, 2, 3)");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).color", "rgb(4, 5, 6)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio2-in-document')).color", "rgb(4, 5, 6)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio3-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).color", "rgb(10, 11, 12)");
+
+debug("Remove radio2-in-document from document, into variable radio2");
+let radio2 = document.getElementById('radio2-in-document');
+radio2.parentElement.removeChild(radio2);
+shouldBe("document.querySelectorAll('radio2-in-document')", "[]");
+shouldBeFalse("document.getElementById('radio1-in-document').indeterminate");
+shouldBeFalse("radio2.indeterminate");
+shouldBeFalse("document.getElementById('radio3-in-document').indeterminate");
+shouldBeFalse("document.getElementById('radio4-in-document').indeterminate");
+
+shouldBeFalse("document.getElementById('radio1-in-document').checked");
+shouldBeTrue("radio2.checked");
+shouldBeFalse("document.getElementById('radio3-in-document').checked");
+shouldBeFalse("document.getElementById('radio4-in-document').checked");
+
+shouldBeTrue("document.getElementById('radio1-in-document').matches(':indeterminate')");
+shouldBeFalse("radio2.matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio3-in-document').matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio4-in-document').matches(':indeterminate')");
+
+shouldBeFalse("document.getElementById('radio1-in-document').matches(':checked')");
+shouldBeTrue("radio2.matches(':checked')");
+shouldBeFalse("document.getElementById('radio3-in-document').matches(':checked')");
+shouldBeFalse("document.getElementById('radio4-in-document').matches(':checked')");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(radio2).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio3-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor", "rgb(1, 2, 3)");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(radio2).color", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio3-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).color", "rgb(10, 11, 12)");
+
+debug("Remove radio3-in-document from document, into variable radio3");
+let radio3 = document.getElementById('radio3-in-document');
+radio3.parentElement.removeChild(radio3);
+shouldBe("document.querySelectorAll('radio3-in-document')", "[]");
+shouldBeFalse("document.getElementById('radio1-in-document').indeterminate");
+shouldBeFalse("radio2.indeterminate");
+shouldBeFalse("radio3.indeterminate");
+shouldBeFalse("document.getElementById('radio4-in-document').indeterminate");
+
+shouldBeFalse("document.getElementById('radio1-in-document').checked");
+shouldBeTrue("radio2.checked");
+shouldBeFalse("radio3.checked");
+shouldBeFalse("document.getElementById('radio4-in-document').checked");
+
+shouldBeTrue("document.getElementById('radio1-in-document').matches(':indeterminate')");
+shouldBeFalse("radio2.matches(':indeterminate')");
+shouldBeTrue("radio3.matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio4-in-document').matches(':indeterminate')");
+
+shouldBeFalse("document.getElementById('radio1-in-document').matches(':checked')");
+shouldBeTrue("radio2.matches(':checked')");
+shouldBeFalse("radio3.matches(':checked')");
+shouldBeFalse("document.getElementById('radio4-in-document').matches(':checked')");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(radio2).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(radio3).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor", "rgb(1, 2, 3)");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(radio2).color", "");
+shouldBeEqualToString("getComputedStyle(radio3).color", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).color", "rgb(10, 11, 12)");
+
+debug("Create new element named webkitRadio");
+let webkitRadio = document.createElement("input");
+webkitRadio.type = "radio";
+shouldBeFalse("document.getElementById('radio1-in-document').indeterminate");
+shouldBeFalse("radio2.indeterminate");
+shouldBeFalse("radio3.indeterminate");
+shouldBeFalse("document.getElementById('radio4-in-document').indeterminate");
+shouldBeFalse("webkitRadio.indeterminate");
+
+shouldBeFalse("document.getElementById('radio1-in-document').checked");
+shouldBeTrue("radio2.checked");
+shouldBeFalse("radio3.checked");
+shouldBeFalse("document.getElementById('radio4-in-document').checked");
+shouldBeFalse("webkitRadio.checked");
+
+shouldBeTrue("document.getElementById('radio1-in-document').matches(':indeterminate')");
+shouldBeFalse("radio2.matches(':indeterminate')");
+shouldBeTrue("radio3.matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio4-in-document').matches(':indeterminate')");
+shouldBeTrue("webkitRadio.matches(':indeterminate')");
+
+shouldBeFalse("document.getElementById('radio1-in-document').matches(':checked')");
+shouldBeTrue("radio2.matches(':checked')");
+shouldBeFalse("radio3.matches(':checked')");
+shouldBeFalse("document.getElementById('radio4-in-document').matches(':checked')");
+shouldBeFalse("webkitRadio.matches(':checked')");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(radio2).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(radio3).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(webkitRadio).backgroundColor", "");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(radio2).color", "");
+shouldBeEqualToString("getComputedStyle(radio3).color", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(webkitRadio).color", "");
+
+debug("Check webkitRadio");
+webkitRadio.checked = true;
+shouldBeFalse("document.getElementById('radio1-in-document').indeterminate");
+shouldBeFalse("radio2.indeterminate");
+shouldBeFalse("radio3.indeterminate");
+shouldBeFalse("document.getElementById('radio4-in-document').indeterminate");
+shouldBeFalse("webkitRadio.indeterminate");
+
+shouldBeFalse("document.getElementById('radio1-in-document').checked");
+shouldBeTrue("radio2.checked");
+shouldBeFalse("radio3.checked");
+shouldBeFalse("document.getElementById('radio4-in-document').checked");
+shouldBeTrue("webkitRadio.checked");
+
+shouldBeTrue("document.getElementById('radio1-in-document').matches(':indeterminate')");
+shouldBeFalse("radio2.matches(':indeterminate')");
+shouldBeTrue("radio3.matches(':indeterminate')");
+shouldBeTrue("document.getElementById('radio4-in-document').matches(':indeterminate')");
+shouldBeFalse("webkitRadio.matches(':indeterminate')");
+
+shouldBeFalse("document.getElementById('radio1-in-document').matches(':checked')");
+shouldBeTrue("radio2.matches(':checked')");
+shouldBeFalse("radio3.matches(':checked')");
+shouldBeFalse("document.getElementById('radio4-in-document').matches(':checked')");
+shouldBeTrue("webkitRadio.matches(':checked')");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(radio2).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(radio3).backgroundColor", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).backgroundColor", "rgb(1, 2, 3)");
+shouldBeEqualToString("getComputedStyle(webkitRadio).backgroundColor", "");
+
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio1-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(radio2).color", "");
+shouldBeEqualToString("getComputedStyle(radio3).color", "");
+shouldBeEqualToString("getComputedStyle(document.getElementById('radio4-in-document')).color", "rgb(10, 11, 12)");
+shouldBeEqualToString("getComputedStyle(webkitRadio).color", "");
+
+document.getElementById("testcases").style.display = "none";
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorspseudoindeterminatewithradiobuttonsstyleupdateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update-expected.txt (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update-expected.txt 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+Verify we invalidate radio button groups to match :indeterminate when a button is checked/unchecked
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio2", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is []
+Check radio3
+PASS elementsWithIndeterminateStyle() is ["radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio3"]
+Check radio8
+PASS elementsWithIndeterminateStyle() is []
+PASS checkedElements() is ["radio3", "radio8"]
+Check radio4
+PASS elementsWithIndeterminateStyle() is []
+PASS checkedElements() is ["radio4", "radio8"]
+Check radio9
+PASS elementsWithIndeterminateStyle() is []
+PASS checkedElements() is ["radio4", "radio9"]
+Uncheck radio4
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio2", "radio3", "radio4", "radio5"]
+PASS checkedElements() is ["radio9"]
+Uncheck radio9
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio2", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is []
+Check radio1
+PASS elementsWithIndeterminateStyle() is ["radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio1"]
+Check radio2
+PASS elementsWithIndeterminateStyle() is ["radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio2"]
+Remove radio3 from its group
+PASS elementsWithIndeterminateStyle() is ["radio3", "radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio2"]
+Remove radio6 from its group
+PASS elementsWithIndeterminateStyle() is ["radio3", "radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio2"]
+Remove radio2 from its group
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]
+PASS checkedElements() is ["radio2"]
+Check radio7
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio3", "radio4", "radio5", "radio6"]
+PASS checkedElements() is ["radio2", "radio7"]
+Check radio8
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio3", "radio4", "radio5", "radio6"]
+PASS checkedElements() is ["radio2", "radio8"]
+Remove radio9 from its group
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio3", "radio4", "radio5", "radio6", "radio9"]
+PASS checkedElements() is ["radio2", "radio8"]
+Remove radio8 from its group
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio3", "radio4", "radio5", "radio6", "radio7", "radio9", "radio10"]
+PASS checkedElements() is ["radio2", "radio8"]
+Remove radio7 from its group
+PASS elementsWithIndeterminateStyle() is ["radio1", "radio3", "radio4", "radio5", "radio6", "radio7", "radio9", "radio10"]
+PASS checkedElements() is ["radio2", "radio8"]
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorspseudoindeterminatewithradiobuttonsstyleupdatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html (0 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -0,0 +1,148 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+ input {
+ background-color: rgb(1, 2, 3);
+ }
+ :indeterminate {
+ background-color: rgb(4, 5, 6);
+ }
+</style>
+</head>
+<body>
+ <div id="with-renderer">
+ <!-- With renderer -->
+ <input type="radio" name="group1" id="radio1">
+ <input type="radio" name="group1" id="radio2">
+ <input type="radio" name="group1" id="radio3">
+ <span>
+ <input type="radio" name="group1" id="radio4">
+ <input type="radio" name="group1" id="radio5">
+ </span>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <input type="radio" name="group2" id="radio6">
+ <span>
+ <input type="radio" name="group2" id="radio7">
+ <input type="radio" name="group2" id="radio8">
+ </span>
+ <input type="radio" name="group2" id="radio9">
+ <input type="radio" name="group2" id="radio10">
+ </div>
+</body>
+<script>
+
+description('Verify we invalidate radio button groups to match :indeterminate when a button is checked/unchecked');
+let allInputs = document.querySelectorAll("input");
+
+function elementsWithIndeterminateStyle() {
+ let elements = [];
+ for (let inputElement of allInputs) {
+ let backgroundColor = getComputedStyle(inputElement).backgroundColor;
+ if (backgroundColor === "rgb(4, 5, 6)")
+ elements.push(inputElement.id);
+ }
+ return elements;
+}
+
+function checkedElements() {
+ let elements = [];
+ for (let inputElement of allInputs) {
+ if (inputElement.checked)
+ elements.push(inputElement.id);
+ }
+ return elements;
+}
+
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio2", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '[]');
+
+debug("Check radio3");
+document.getElementById("radio3").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '["radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio3"]');
+
+debug("Check radio8");
+document.getElementById("radio8").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '[]');
+shouldBe("checkedElements()", '["radio3", "radio8"]');
+
+debug("Check radio4");
+document.getElementById("radio4").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '[]');
+shouldBe("checkedElements()", '["radio4", "radio8"]');
+
+debug("Check radio9");
+document.getElementById("radio9").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '[]');
+shouldBe("checkedElements()", '["radio4", "radio9"]');
+
+debug("Uncheck radio4");
+document.getElementById("radio4").checked = false;
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio2", "radio3", "radio4", "radio5"]');
+shouldBe("checkedElements()", '["radio9"]');
+
+debug("Uncheck radio9");
+document.getElementById("radio9").checked = false;
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio2", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '[]');
+
+debug("Check radio1");
+document.getElementById("radio1").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '["radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio1"]');
+
+debug("Check radio2");
+document.getElementById("radio2").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '["radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio2"]');
+
+debug("Remove radio3 from its group");
+document.getElementById("radio3").name = "";
+shouldBe("elementsWithIndeterminateStyle()", '["radio3", "radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio2"]');
+
+debug("Remove radio6 from its group");
+document.getElementById("radio6").name = "";
+shouldBe("elementsWithIndeterminateStyle()", '["radio3", "radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio2"]');
+
+debug("Remove radio2 from its group");
+document.getElementById("radio2").name = "";
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio3", "radio4", "radio5", "radio6", "radio7", "radio8", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio2"]');
+
+debug("Check radio7");
+document.getElementById("radio7").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio3", "radio4", "radio5", "radio6"]');
+shouldBe("checkedElements()", '["radio2", "radio7"]');
+
+debug("Check radio8");
+document.getElementById("radio8").checked = true;
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio3", "radio4", "radio5", "radio6"]');
+shouldBe("checkedElements()", '["radio2", "radio8"]');
+
+debug("Remove radio9 from its group");
+document.getElementById("radio9").name = "";
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio3", "radio4", "radio5", "radio6", "radio9"]');
+shouldBe("checkedElements()", '["radio2", "radio8"]');
+
+debug("Remove radio8 from its group");
+document.getElementById("radio8").name = "";
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio3", "radio4", "radio5", "radio6", "radio7", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio2", "radio8"]');
+
+debug("Remove radio7 from its group");
+document.getElementById("radio7").name = "";
+shouldBe("elementsWithIndeterminateStyle()", '["radio1", "radio3", "radio4", "radio5", "radio6", "radio7", "radio9", "radio10"]');
+shouldBe("checkedElements()", '["radio2", "radio8"]');
+
+
+// Hide the elements to make the results prettier.
+document.getElementById("with-renderer").style.display = "none";
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-17 Benjamin Poulain <benjamin@webkit.org>
+
+ :indeterminate pseudo-class should match radios whose group has no checked radio
+ https://bugs.webkit.org/show_bug.cgi?id=156270
+
+ Reviewed by Simon Fraser.
+
+ * web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-expected.txt:
+ One more pass on official tests :)
+
</ins><span class="cx"> 2016-06-17 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> CORS preflight with a non-200 response should be a preflight failure
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsselectorspseudoclassesindeterminateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-expected.txt (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-expected.txt 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/indeterminate-expected.txt 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx">
</span><span class="cx">
</span><del>-FAIL ':progress' matches <input>s radio buttons whose radio button group contains no checked input and <progress> elements without value attribute assert_array_equals: lengths differ, expected 5 got 1
-FAIL dynamically check a radio input in a radio button group assert_array_equals: lengths differ, expected 3 got 1
</del><ins>+PASS ':progress' matches <input>s radio buttons whose radio button group contains no checked input and <progress> elements without value attribute
+PASS dynamically check a radio input in a radio button group
</ins><span class="cx"> FAIL click on radio4 which is in the indeterminate state assert_array_equals: lengths differ, expected 2 got 1
</span><span class="cx"> PASS adding a value to progress1 should put it in a determinate state
</span><span class="cx"> PASS removing progress2's value should put it in an indeterminate state
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2016-06-17 Benjamin Poulain <benjamin@webkit.org>
+
+ :indeterminate pseudo-class should match radios whose group has no checked radio
+ https://bugs.webkit.org/show_bug.cgi?id=156270
+
+ Reviewed by Simon Fraser.
+
+ The pseudo-class ":indeterminate" is supposed to match radio buttons
+ for which the entire group has no checked button.
+ Spec: https://html.spec.whatwg.org/#pseudo-classes:selector-indeterminate
+
+ The change is straightforward with one non-obvious choice:
+ I added matchesIndeterminatePseudoClass() in addition to shouldAppearIndeterminate().
+
+ The reason is shouldAppearIndeterminate() is used for styling and AX of elements
+ with an indeterminate states (check boxes and progress element). There is no such
+ UI for radio boxes.
+ I could have extended shouldAppearIndeterminate() to radio box
+ then filter out this case in RenderTheme. The problem is doing that would also requires
+ changes to the repaint logic to match :indeterminate. It seemed overkill to me to
+ change repaint() for a case that is never used in practice.
+
+ Tests: fast/css/pseudo-indeterminate-radio-buttons-basics.html
+ fast/css/pseudo-indeterminate-with-radio-buttons-style-invalidation.html
+ fast/selectors/detached-radio-button-checked-and-indeterminate-states.html
+ fast/selectors/pseudo-indeterminate-with-radio-buttons-style-update.html
+
+ * css/SelectorCheckerTestFunctions.h:
+ (WebCore::shouldAppearIndeterminate):
+ * dom/Element.cpp:
+ (WebCore::Element::matchesIndeterminatePseudoClass):
+ * dom/Element.h:
+ * dom/RadioButtonGroups.cpp:
+ (WebCore::RadioButtonGroup::setCheckedButton):
+ (WebCore::RadioButtonGroup::updateCheckedState):
+ (WebCore::RadioButtonGroup::remove):
+ (WebCore::RadioButtonGroup::setNeedsStyleRecalcForAllButtons):
+ (WebCore::RadioButtonGroups::hasCheckedButton):
+ * dom/RadioButtonGroups.h:
+ * html/CheckboxInputType.cpp:
+ (WebCore::CheckboxInputType::matchesIndeterminatePseudoClass):
+ (WebCore::CheckboxInputType::shouldAppearIndeterminate):
+ (WebCore::CheckboxInputType::supportsIndeterminateAppearance): Deleted.
+ * html/CheckboxInputType.h:
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::setChecked):
+ (WebCore::HTMLInputElement::matchesIndeterminatePseudoClass):
+ (WebCore::HTMLInputElement::shouldAppearIndeterminate):
+ (WebCore::HTMLInputElement::radioButtonGroups):
+ * html/HTMLInputElement.h:
+ * html/InputType.cpp:
+ (WebCore::InputType::matchesIndeterminatePseudoClass):
+ (WebCore::InputType::shouldAppearIndeterminate):
+ (WebCore::InputType::supportsIndeterminateAppearance): Deleted.
+ * html/InputType.h:
+ * html/RadioInputType.cpp:
+ (WebCore::RadioInputType::matchesIndeterminatePseudoClass):
+ (WebCore::RadioInputType::willDispatchClick): Deleted.
+ (WebCore::RadioInputType::didDispatchClick): Deleted.
+ (WebCore::RadioInputType::supportsIndeterminateAppearance): Deleted.
+ The iOS specific code is just plain wrong.
+ It was changing the indeterminate state of the input element.
+ The spec clearly says that state is only used by checkbox:
+ https://html.spec.whatwg.org/#dom-input-indeterminate
+
+ Moreover, the style update would not change the indeterminate state
+ of other buttons in the Button Group, which is just bizarre.
+ RenderThemeIOS does not make use of any of this with the current style.
+
+ * html/RadioInputType.h:
+ * style/StyleSharingResolver.cpp:
+ (WebCore::Style::SharingResolver::canShareStyleWithElement):
+ (WebCore::Style::canShareStyleWithControl): Deleted.
+ (WebCore::Style::SharingResolver::sharingCandidateHasIdenticalStyleAffectingAttributes): Deleted.
+ Style sharing is unified behind the selector matching which is neat.
+
</ins><span class="cx"> 2016-06-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202152.
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -983,7 +983,7 @@
</span><span class="cx"> case CSSSelector::PseudoClassChecked:
</span><span class="cx"> return isChecked(element);
</span><span class="cx"> case CSSSelector::PseudoClassIndeterminate:
</span><del>- return shouldAppearIndeterminate(element);
</del><ins>+ return matchesIndeterminatePseudoClass(element);
</ins><span class="cx"> case CSSSelector::PseudoClassRoot:
</span><span class="cx"> if (&element == element.document().documentElement())
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerTestFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 Dhi Aurrahman <diorahman@rockybars.com>
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -221,9 +221,9 @@
</span><span class="cx"> return element.matchesReadWritePseudoClass();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE bool shouldAppearIndeterminate(const Element& element)
</del><ins>+ALWAYS_INLINE bool matchesIndeterminatePseudoClass(const Element& element)
</ins><span class="cx"> {
</span><del>- return element.shouldAppearIndeterminate();
</del><ins>+ return element.matchesIndeterminatePseudoClass();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool scrollbarMatchesEnabledPseudoClass(const SelectorChecker::CheckingContext& context)
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(isInRange));
</span><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx"> case CSSSelector::PseudoClassIndeterminate:
</span><del>- fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(shouldAppearIndeterminate));
</del><ins>+ fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(matchesIndeterminatePseudoClass));
</ins><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx"> case CSSSelector::PseudoClassInvalid:
</span><span class="cx"> fragment.unoptimizedPseudoClasses.append(JSC::FunctionPtr(isInvalid));
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * (C) 2001 Peter Kelly (pmk@post.com)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><span class="cx"> * (C) 2007 David Smith (catfish.man@gmail.com)
</span><del>- * Copyright (C) 2004-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2007 Eric Seidel (eric@webkit.org)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -2755,6 +2755,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Element::matchesIndeterminatePseudoClass() const
+{
+ return shouldAppearIndeterminate();
+}
+
</ins><span class="cx"> bool Element::matches(const String& selector, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> SelectorQuery* selectorQuery = document().selectorQueryForString(selector, ec);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/dom/Element.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Peter Kelly (pmk@post.com)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -386,6 +386,7 @@
</span><span class="cx"> void didShadowTreeAwareChildrenChange();
</span><span class="cx">
</span><span class="cx"> virtual bool matchesReadWritePseudoClass() const;
</span><ins>+ virtual bool matchesIndeterminatePseudoClass() const;
</ins><span class="cx"> bool matches(const String& selectors, ExceptionCode&);
</span><span class="cx"> Element* closest(const String& selectors, ExceptionCode&);
</span><span class="cx"> virtual bool shouldAppearIndeterminate() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomRadioButtonGroupscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RadioButtonGroups.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RadioButtonGroups.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/dom/RadioButtonGroups.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2008, 2009, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -42,8 +42,10 @@
</span><span class="cx"> Vector<HTMLInputElement*> members() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void setNeedsStyleRecalcForAllButtons();
</ins><span class="cx"> void updateValidityForAllButtons();
</span><span class="cx"> bool isValid() const;
</span><ins>+ void changeCheckedButton(HTMLInputElement*);
</ins><span class="cx"> void setCheckedButton(HTMLInputElement*);
</span><span class="cx">
</span><span class="cx"> HashSet<HTMLInputElement*> m_members;
</span><span class="lines">@@ -75,6 +77,12 @@
</span><span class="cx"> HTMLInputElement* oldCheckedButton = m_checkedButton;
</span><span class="cx"> if (oldCheckedButton == button)
</span><span class="cx"> return;
</span><ins>+
+ bool hadCheckedButton = m_checkedButton;
+ bool willHaveCheckedButton = button;
+ if (hadCheckedButton != willHaveCheckedButton)
+ setNeedsStyleRecalcForAllButtons();
+
</ins><span class="cx"> m_checkedButton = button;
</span><span class="cx"> if (oldCheckedButton)
</span><span class="cx"> oldCheckedButton->setChecked(false);
</span><span class="lines">@@ -110,7 +118,7 @@
</span><span class="cx"> setCheckedButton(button);
</span><span class="cx"> else {
</span><span class="cx"> if (m_checkedButton == button)
</span><del>- m_checkedButton = nullptr;
</del><ins>+ setCheckedButton(nullptr);
</ins><span class="cx"> }
</span><span class="cx"> if (wasValid != isValid())
</span><span class="cx"> updateValidityForAllButtons();
</span><span class="lines">@@ -137,14 +145,20 @@
</span><span class="cx"> HashSet<HTMLInputElement*>::iterator it = m_members.find(button);
</span><span class="cx"> if (it == m_members.end())
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> bool wasValid = isValid();
</span><span class="cx"> m_members.remove(it);
</span><span class="cx"> if (button->isRequired()) {
</span><span class="cx"> ASSERT(m_requiredCount);
</span><span class="cx"> --m_requiredCount;
</span><span class="cx"> }
</span><del>- if (m_checkedButton == button)
- m_checkedButton = nullptr;
</del><ins>+ if (m_checkedButton) {
+ button->setNeedsStyleRecalc();
+ if (m_checkedButton == button) {
+ m_checkedButton = nullptr;
+ setNeedsStyleRecalcForAllButtons();
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if (m_members.isEmpty()) {
</span><span class="cx"> ASSERT(!m_requiredCount);
</span><span class="lines">@@ -158,6 +172,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RadioButtonGroup::setNeedsStyleRecalcForAllButtons()
+{
+ for (auto& button : m_members) {
+ ASSERT(button->isRadioButton());
+ button->setNeedsStyleRecalc();
+ }
+}
+
</ins><span class="cx"> void RadioButtonGroup::updateValidityForAllButtons()
</span><span class="cx"> {
</span><span class="cx"> for (auto& button : m_members) {
</span><span class="lines">@@ -250,6 +272,17 @@
</span><span class="cx"> return group ? group->checkedButton() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RadioButtonGroups::hasCheckedButton(const HTMLInputElement* element) const
+{
+ ASSERT(element->isRadioButton());
+ const AtomicString& name = element->name();
+ if (name.isEmpty() || !m_nameToGroupMap)
+ return element->checked();
+
+ const RadioButtonGroup* group = m_nameToGroupMap->get(name.impl());
+ return group->checkedButton();
+}
+
</ins><span class="cx"> bool RadioButtonGroups::isInRequiredGroup(HTMLInputElement* element) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(element->isRadioButton());
</span></span></pre></div>
<a id="trunkSourceWebCoredomRadioButtonGroupsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/RadioButtonGroups.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/RadioButtonGroups.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/dom/RadioButtonGroups.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> void requiredAttributeChanged(HTMLInputElement*);
</span><span class="cx"> void removeButton(HTMLInputElement*);
</span><span class="cx"> HTMLInputElement* checkedButtonForGroup(const AtomicString& groupName) const;
</span><ins>+ bool hasCheckedButton(const HTMLInputElement*) const;
</ins><span class="cx"> bool isInRequiredGroup(HTMLInputElement*) const;
</span><span class="cx"> Vector<HTMLInputElement*> groupMembers(const HTMLInputElement&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlCheckboxInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/CheckboxInputType.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/CheckboxInputType.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/CheckboxInputType.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -92,9 +92,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CheckboxInputType::supportsIndeterminateAppearance() const
</del><ins>+bool CheckboxInputType::matchesIndeterminatePseudoClass() const
</ins><span class="cx"> {
</span><del>- return true;
</del><ins>+ return shouldAppearIndeterminate();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CheckboxInputType::shouldAppearIndeterminate() const
+{
+ return element().indeterminate();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlCheckboxInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/CheckboxInputType.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/CheckboxInputType.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/CheckboxInputType.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> void willDispatchClick(InputElementClickState&) override;
</span><span class="cx"> void didDispatchClick(Event*, const InputElementClickState&) override;
</span><span class="cx"> bool isCheckbox() const override;
</span><del>- bool supportsIndeterminateAppearance() const override;
</del><ins>+ bool matchesIndeterminatePseudoClass() const override;
+ bool shouldAppearIndeterminate() const override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> setNeedsStyleRecalc();
</span><span class="cx">
</span><span class="cx"> if (RadioButtonGroups* buttons = radioButtonGroups())
</span><del>- buttons->updateCheckedState(this);
</del><ins>+ buttons->updateCheckedState(this);
</ins><span class="cx"> if (renderer() && renderer()->style().hasAppearance())
</span><span class="cx"> renderer()->theme().stateChanged(*renderer(), ControlStates::CheckedState);
</span><span class="cx"> updateValidity();
</span><span class="lines">@@ -1763,9 +1763,21 @@
</span><span class="cx"> return m_inputType->defaultToolTip();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool HTMLInputElement::matchesIndeterminatePseudoClass() const
+{
+ // For input elements, matchesIndeterminatePseudoClass()
+ // is not equivalent to shouldAppearIndeterminate() because of radio button.
+ //
+ // A group of radio button without any checked button is indeterminate
+ // for the :indeterminate selector. On the other hand, RenderTheme
+ // currently only supports single element being indeterminate.
+ // Because of this, radio is indetermindate for CSS but not for render theme.
+ return m_inputType->matchesIndeterminatePseudoClass();
+}
+
</ins><span class="cx"> bool HTMLInputElement::shouldAppearIndeterminate() const
</span><span class="cx"> {
</span><del>- return m_inputType->supportsIndeterminateAppearance() && indeterminate();
</del><ins>+ return m_inputType->shouldAppearIndeterminate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CAPTURE)
</span><span class="lines">@@ -1801,12 +1813,12 @@
</span><span class="cx"> RadioButtonGroups* HTMLInputElement::radioButtonGroups() const
</span><span class="cx"> {
</span><span class="cx"> if (!isRadioButton())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> if (HTMLFormElement* formElement = form())
</span><span class="cx"> return &formElement->radioButtonGroups();
</span><span class="cx"> if (inDocument())
</span><span class="cx"> return &document().formController().radioButtonGroups();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void HTMLInputElement::addToRadioButtonGroup()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2000 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2005, 2006, 2007, 2010, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Samsung Electronics. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx"> void setIndeterminate(bool);
</span><span class="cx"> // shouldAppearChecked is used by the rendering tree/CSS while checked() is used by JS to determine checked state
</span><span class="cx"> bool shouldAppearChecked() const;
</span><ins>+ bool matchesIndeterminatePseudoClass() const final;
</ins><span class="cx"> bool shouldAppearIndeterminate() const final;
</span><span class="cx">
</span><span class="cx"> unsigned size() const;
</span><span class="lines">@@ -274,6 +275,8 @@
</span><span class="cx"> Vector<HTMLInputElement*> radioButtonGroup() const;
</span><span class="cx"> HTMLInputElement* checkedRadioButtonForGroup() const;
</span><span class="cx"> bool isInRequiredRadioButtonGroup();
</span><ins>+ // Returns null if this isn't associated with any radio button group.
+ RadioButtonGroups* radioButtonGroups() const;
</ins><span class="cx">
</span><span class="cx"> // Functions for InputType classes.
</span><span class="cx"> void setValueInternal(const String&, TextFieldEventBehavior);
</span><span class="lines">@@ -422,8 +425,6 @@
</span><span class="cx"> void maxLengthAttributeChanged(const AtomicString& newValue);
</span><span class="cx"> void updateValueIfNeeded();
</span><span class="cx">
</span><del>- // Returns null if this isn't associated with any radio button group.
- RadioButtonGroups* radioButtonGroups() const;
</del><span class="cx"> void addToRadioButtonGroup();
</span><span class="cx"> void removeFromRadioButtonGroup();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/InputType.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -966,11 +966,16 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool InputType::supportsIndeterminateAppearance() const
</del><ins>+bool InputType::matchesIndeterminatePseudoClass() const
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool InputType::shouldAppearIndeterminate() const
+{
+ return false;
+}
+
</ins><span class="cx"> bool InputType::supportsSelectionAPI() const
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/InputType.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -267,7 +267,8 @@
</span><span class="cx"> virtual void capsLockStateMayHaveChanged();
</span><span class="cx"> virtual void updateAutoFillButton();
</span><span class="cx"> virtual String defaultToolTip() const;
</span><del>- virtual bool supportsIndeterminateAppearance() const;
</del><ins>+ virtual bool matchesIndeterminatePseudoClass() const;
+ virtual bool shouldAppearIndeterminate() const;
</ins><span class="cx"> virtual bool supportsSelectionAPI() const;
</span><span class="cx"> virtual Color valueAsColor() const;
</span><span class="cx"> virtual void selectColor(const Color&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioInputType.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioInputType.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/RadioInputType.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2011, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -151,13 +151,6 @@
</span><span class="cx"> state.checked = element().checked();
</span><span class="cx"> state.checkedRadioButton = element().checkedRadioButtonForGroup();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- state.indeterminate = element().indeterminate();
-
- if (element().indeterminate())
- element().setIndeterminate(false);
-#endif
-
</del><span class="cx"> element().setChecked(true, DispatchChangeEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -173,11 +166,6 @@
</span><span class="cx"> && checkedRadioButton->name() == element().name()) {
</span><span class="cx"> checkedRadioButton->setChecked(true);
</span><span class="cx"> }
</span><del>-
-#if PLATFORM(IOS)
- element().setIndeterminate(state.indeterminate);
-#endif
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The work we did in willDispatchClick was default handling.
</span><span class="lines">@@ -189,13 +177,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RadioInputType::supportsIndeterminateAppearance() const
</del><ins>+bool RadioInputType::matchesIndeterminatePseudoClass() const
</ins><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
- return true;
-#else
- return false;
-#endif
</del><ins>+ const HTMLInputElement& element = this->element();
+ if (const RadioButtonGroups* radioButtonGroups = element.radioButtonGroups())
+ return !radioButtonGroups->hasCheckedButton(&element);
+ return !element.checked();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioInputType.h (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioInputType.h 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/html/RadioInputType.h 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> void willDispatchClick(InputElementClickState&) override;
</span><span class="cx"> void didDispatchClick(Event*, const InputElementClickState&) override;
</span><span class="cx"> bool isRadioButton() const override;
</span><del>- bool supportsIndeterminateAppearance() const override;
</del><ins>+ bool matchesIndeterminatePseudoClass() const override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleSharingResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleSharingResolver.cpp (202196 => 202197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleSharingResolver.cpp 2016-06-18 03:33:19 UTC (rev 202196)
+++ trunk/Source/WebCore/style/StyleSharingResolver.cpp 2016-06-18 05:53:28 UTC (rev 202197)
</span><span class="lines">@@ -179,8 +179,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (thisInputElement.shouldAppearChecked() != otherInputElement.shouldAppearChecked())
</span><span class="cx"> return false;
</span><del>- if (thisInputElement.shouldAppearIndeterminate() != otherInputElement.shouldAppearIndeterminate())
- return false;
</del><span class="cx"> if (thisInputElement.isRequired() != otherInputElement.isRequired())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -283,6 +281,9 @@
</span><span class="cx"> if (element.matchesInvalidPseudoClass() != element.matchesValidPseudoClass())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (candidateElement.matchesIndeterminatePseudoClass() != element.matchesIndeterminatePseudoClass())
+ return false;
+
</ins><span class="cx"> if (element.shadowRoot() && !element.shadowRoot()->styleResolver().ruleSets().authorStyle()->hostPseudoClassRules().isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -329,11 +330,6 @@
</span><span class="cx"> if (const_cast<StyledElement&>(element).presentationAttributeStyle() != const_cast<StyledElement&>(sharingCandidate).presentationAttributeStyle())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (element.hasTagName(HTMLNames::progressTag)) {
- if (element.shouldAppearIndeterminate() != sharingCandidate.shouldAppearIndeterminate())
- return false;
- }
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>