Changeset 94059 in webkit

Timestamp:

Aug 30, 2011, 1:07:08 AM (15 years ago)

Author:

tkent@chromium.org

Message:

Merge 94045 - REGRESSION(r88115): Disabling a file upload control causes an endless busyloop.
​https://bugs.webkit.org/show_bug.cgi?id=66659

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/forms/file/disabling-file-busy-loop.html

• rendering/RenderFileUploadControl.cpp:

(WebCore::RenderFileUploadControl::updateFromElement):
Don't call setDisabled() if the disabled status is not changed.
setDisabled() causes styleRecalc(), and
HTMLFormControlElement::styleRecalc() causes
updateFromElement(). updateFromElement() should not call
setDisabled() again.

LayoutTests:

• fast/forms/file/disabling-file-busy-loop-expected.txt: Added.
• fast/forms/file/disabling-file-busy-loop.html: Added.

TBR=​tkent@chromium.org
BUG=94710
Review URL: ​http://codereview.chromium.org/7792032

File:

• branches/chromium/835/Source/WebCore/rendering/RenderFileUploadControl.cpp (modified) (1 diff)

branches/chromium/835/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -64 +64 @@
     ASSERT(input->isFileUpload());
 
-    if (HTMLInputElement* button = uploadButton())
-        button->setDisabled(!theme()->isEnabled(this));
+    if (HTMLInputElement* button = uploadButton()) {
+        bool newDisabled = !theme()->isEnabled(this);
+        // We should avoid to call HTMLFormControlElement::setDisabled() as
+        // possible because setAttribute() in setDisabled() can cause style
+        // recalculation, and HTMLFormControlElement::recalcStyle() calls
+        // updateFromElement() eventually.
+        if (button->disabled() != newDisabled)
+            button->setDisabled(newDisabled);
+    }
 
     // This only supports clearing out the files, but that's OK because for