Unreviewed, rolling out r105968.

http://trac.webkit.org/changeset/105968
https://bugs.webkit.org/show_bug.cgi?id=76995

Incorrect behavior change

Source/WebCore:

* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setIndeterminate):

LayoutTests:

* fast/forms/indeterminate-radio.html:
* fast/forms/radio-checkbox-restore-indeterminate.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105980 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c30a3cf..8644bae 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-26  Kent Tamura  <tkent@chromium.org>
+
+        Unreviewed, rolling out r105968.
+        http://trac.webkit.org/changeset/105968
+        https://bugs.webkit.org/show_bug.cgi?id=76995
+
+        Incorrect behavior change
+
+        * fast/forms/indeterminate-radio.html:
+        * fast/forms/radio-checkbox-restore-indeterminate.html:
+
 2012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         crash in WebCore::RenderSVGContainer::paint

diff --git a/LayoutTests/fast/forms/indeterminate-radio.html b/LayoutTests/fast/forms/indeterminate-radio.html
index d3239e3..d484404 100644 (file)
--- a/LayoutTests/fast/forms/indeterminate-radio.html
+++ b/LayoutTests/fast/forms/indeterminate-radio.html
@@ -5,11 +5,11 @@
     <style type="text/css">
     div
     {
-        color: green;
+        color: red;
     }
     input:indeterminate + #test
     {
-        color: red;
+        color: green;
     }
 </style>
 </head>

diff --git a/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html b/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html
index 16ccdd8..fb89ccf 100644 (file)
--- a/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html
+++ b/LayoutTests/fast/forms/radio-checkbox-restore-indeterminate.html
@@ -67,8 +67,8 @@
         log('Click unselected all radio buttons: FAIL');
 
         log('<br>Checking whether default-prevented click clobbered indeterminate state:')
-        log('On checked radio button: ' + (!radio3.indeterminate ? 'PASS' : 'FAIL'));
-        log('On unchecked radio button: ' + (!radio4.indeterminate ? 'PASS' : 'FAIL'));
+        log('On checked radio button: ' + (radio3.indeterminate ? 'PASS' : 'FAIL'));
+        log('On unchecked radio button: ' + (radio4.indeterminate ? 'PASS' : 'FAIL'));
         log('On checked checkbox: ' + (check1.indeterminate ? 'PASS' : 'FAIL'));
         log('On unchecked checkbox: ' + (check2.indeterminate ? 'PASS' : 'FAIL'));
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7842646..964b5cf 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-26  Kent Tamura  <tkent@chromium.org>
+
+        Unreviewed, rolling out r105968.
+        http://trac.webkit.org/changeset/105968
+        https://bugs.webkit.org/show_bug.cgi?id=76995
+
+        Incorrect behavior change
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setIndeterminate):
+
 2012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         crash in WebCore::RenderSVGContainer::paint

diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index a231b6f..413c127 100644 (file)
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -946,7 +946,7 @@ void HTMLInputElement::setChecked(bool nowChecked, bool sendChangeEvent)
 
 void HTMLInputElement::setIndeterminate(bool newValue)
 {
-    if (!isCheckbox() || indeterminate() == newValue)
+    if (!m_inputType->isCheckable() || indeterminate() == newValue)
         return;
 
     m_isIndeterminate = newValue;