<!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>[56174] 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/56174">56174</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2010-03-18 11:22:30 -0700 (Thu, 18 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-18  Simon Fraser  &lt;simon.fraser@apple.com&gt;

        Reviewed by Dave Hyatt.

        https://bugs.webkit.org/show_bug.cgi?id=36273
        CSS3 :indeterminate and input type=radio test fails

        The :indeterminate pseudo-class should apply to both radio buttons and checkboxes.

        * html/HTMLInputElement.cpp:
        (WebCore::HTMLInputElement::setIndeterminate): Use allowsIndeterminate() to determine if the input
        supports the indeterminate state.
        (WebCore::HTMLInputElement::preDispatchEventHandler): Use allowsIndeterminate() to determine whether
        to handle the indeterminate state.
        (WebCore::HTMLInputElement::postDispatchEventHandler): Ditto.
        * html/HTMLInputElement.h:
        (WebCore::HTMLInputElement::allowsIndeterminate): New utility method, returns true for radio buttons
        and checkboxes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorehtmlHTMLInputElementcpp">trunk/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLInputElementh">trunk/WebCore/html/HTMLInputElement.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsindeterminateradioexpectedtxt">trunk/LayoutTests/fast/forms/indeterminate-radio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsindeterminateradiohtml">trunk/LayoutTests/fast/forms/indeterminate-radio.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (56173 => 56174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-18 18:11:05 UTC (rev 56173)
+++ trunk/LayoutTests/ChangeLog        2010-03-18 18:22:30 UTC (rev 56174)
</span><span class="lines">@@ -17,6 +17,18 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dave Hyatt.
</span><span class="cx"> 
</span><ins>+        https://bugs.webkit.org/show_bug.cgi?id=36273
+        CSS3 :indeterminate and input type=radio test fails
+
+        The :indeterminate pseudo-class should apply to both radio buttons and checkboxes.
+
+        * fast/forms/indeterminate-radio-expected.txt: Added.
+        * fast/forms/indeterminate-radio.html: Added.
+
+2010-03-18  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Reviewed by Dave Hyatt.
+
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=36271
</span><span class="cx">         CSS3 :enabled on an input type=hidden element fails
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsindeterminateradioexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/indeterminate-radio-expected.txt (0 => 56174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/indeterminate-radio-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/forms/indeterminate-radio-expected.txt        2010-03-18 18:22:30 UTC (rev 56174)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+The test passes if the Filler Text below is green.
+
+
+Filler Text
+Pass
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsindeterminateradiohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/indeterminate-radio.html (0 => 56174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/indeterminate-radio.html                                (rev 0)
+++ trunk/LayoutTests/fast/forms/indeterminate-radio.html        2010-03-18 18:22:30 UTC (rev 56174)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0 Strict//EN&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;title&gt;CSS Test: :indeterminate and input type=radio&lt;/title&gt;
+    &lt;style type=&quot;text/css&quot;&gt;
+    div
+    {
+        color: red;
+    }
+    input:indeterminate + #test
+    {
+        color: green;
+    }
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body onload=&quot;mytest()&quot;&gt;
+    &lt;p&gt;The test passes if the Filler Text below is green.&lt;/p&gt;
+    &lt;input type=&quot;radio&quot; /&gt;
+    &lt;div id=&quot;test&quot;&gt;Filler Text&lt;/div&gt;
+    &lt;div id=&quot;testresult&quot; style=&quot;color: blue&quot;&gt;Running&lt;/div&gt;
+    &lt;script type=&quot;text/javascript&quot;&gt;
+
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    function mytest()
+    {
+        try
+        {
+
+        document.getElementsByTagName(&quot;input&quot;)[0].indeterminate = true;
+
+        function ArrayContains(array, value, ci)
+        {
+            ci = ci == true ? true : false;
+            for (var i = 0; i &lt; array.length; i++)
+            {
+                if (ci &amp;&amp; array[i].toLowerCase() == value.toLowerCase())
+                {
+                    return true;
+                }
+                else if (array[i] == value)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        var target = document.getElementById(&quot;test&quot;);
+        var val = getComputedStyle(target, null).getPropertyValue(&quot;color&quot;);
+        var aExpectedValues = new Array(&quot;green&quot;, &quot;#008000&quot;, &quot;rgb(0, 128, 0)&quot;);
+
+        if (ArrayContains(aExpectedValues, val, true))
+        {
+
+          document.getElementById(&quot;testresult&quot;).innerHTML = &quot;Pass&quot;;
+          return;
+        }
+        }
+        catch(e){}
+
+          document.getElementById(&quot;testresult&quot;).innerHTML = &quot;Fail&quot;;
+
+    }
+    &lt;/script&gt;
+
+
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56173 => 56174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-18 18:11:05 UTC (rev 56173)
+++ trunk/WebCore/ChangeLog        2010-03-18 18:22:30 UTC (rev 56174)
</span><span class="lines">@@ -28,6 +28,25 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dave Hyatt.
</span><span class="cx"> 
</span><ins>+        https://bugs.webkit.org/show_bug.cgi?id=36273
+        CSS3 :indeterminate and input type=radio test fails
+
+        The :indeterminate pseudo-class should apply to both radio buttons and checkboxes.
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setIndeterminate): Use allowsIndeterminate() to determine if the input
+        supports the indeterminate state.
+        (WebCore::HTMLInputElement::preDispatchEventHandler): Use allowsIndeterminate() to determine whether
+        to handle the indeterminate state.
+        (WebCore::HTMLInputElement::postDispatchEventHandler): Ditto.
+        * html/HTMLInputElement.h:
+        (WebCore::HTMLInputElement::allowsIndeterminate): New utility method, returns true for radio buttons
+        and checkboxes.
+
+2010-03-18  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Reviewed by Dave Hyatt.
+
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=36271
</span><span class="cx">         CSS3 :enabled on an input type=hidden element fails
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLInputElement.cpp (56173 => 56174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLInputElement.cpp        2010-03-18 18:11:05 UTC (rev 56173)
+++ trunk/WebCore/html/HTMLInputElement.cpp        2010-03-18 18:22:30 UTC (rev 56174)
</span><span class="lines">@@ -1439,8 +1439,8 @@
</span><span class="cx"> 
</span><span class="cx"> void HTMLInputElement::setIndeterminate(bool _indeterminate)
</span><span class="cx"> {
</span><del>-    // Only checkboxes honor indeterminate.
-    if (inputType() != CHECKBOX || indeterminate() == _indeterminate)
</del><ins>+    // Only checkboxes and radio buttons honor indeterminate.
+    if (!allowsIndeterminate() || indeterminate() == _indeterminate)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_indeterminate = _indeterminate;
</span><span class="lines">@@ -1984,7 +1984,7 @@
</span><span class="cx">     void* result = 0; 
</span><span class="cx">     if ((inputType() == CHECKBOX || inputType() == RADIO) &amp;&amp; evt-&gt;isMouseEvent()
</span><span class="cx">             &amp;&amp; evt-&gt;type() == eventNames().clickEvent &amp;&amp; static_cast&lt;MouseEvent*&gt;(evt)-&gt;button() == LeftButton) {
</span><del>-        if (inputType() == CHECKBOX) {
</del><ins>+        if (allowsIndeterminate()) {
</ins><span class="cx">             // As a way to store the state, we return 0 if we were unchecked, 1 if we were checked, and 2 for
</span><span class="cx">             // indeterminate.
</span><span class="cx">             if (indeterminate()) {
</span><span class="lines">@@ -2017,7 +2017,7 @@
</span><span class="cx"> {
</span><span class="cx">     if ((inputType() == CHECKBOX || inputType() == RADIO) &amp;&amp; evt-&gt;isMouseEvent()
</span><span class="cx">             &amp;&amp; evt-&gt;type() == eventNames().clickEvent &amp;&amp; static_cast&lt;MouseEvent*&gt;(evt)-&gt;button() == LeftButton) {
</span><del>-        if (inputType() == CHECKBOX) {
</del><ins>+        if (allowsIndeterminate()) {
</ins><span class="cx">             // Reverse the checking we did in preDispatch.
</span><span class="cx">             if (evt-&gt;defaultPrevented() || evt-&gt;defaultHandled()) {
</span><span class="cx">                 if (data == (void*)0x2)
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLInputElement.h (56173 => 56174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLInputElement.h        2010-03-18 18:11:05 UTC (rev 56173)
+++ trunk/WebCore/html/HTMLInputElement.h        2010-03-18 18:22:30 UTC (rev 56174)
</span><span class="lines">@@ -131,8 +131,11 @@
</span><span class="cx"> 
</span><span class="cx">     bool checked() const { return m_checked; }
</span><span class="cx">     void setChecked(bool, bool sendChangeEvent = false);
</span><ins>+
+    bool allowsIndeterminate() const { return inputType() == CHECKBOX || inputType() == RADIO; }
</ins><span class="cx">     bool indeterminate() const { return m_indeterminate; }
</span><span class="cx">     void setIndeterminate(bool);
</span><ins>+
</ins><span class="cx">     virtual int size() const;
</span><span class="cx">     virtual const AtomicString&amp; formControlType() const;
</span><span class="cx">     void setType(const String&amp;);
</span></span></pre>
</div>
</div>

</body>
</html>