Changeset 94045 in webkit

Timestamp:

Aug 29, 2011, 10:22:37 PM (15 years ago)

Author:

tkent@chromium.org

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/file (added)
• LayoutTests/fast/forms/file/disabling-file-busy-loop-expected.txt (added)
• LayoutTests/fast/forms/file/disabling-file-busy-loop.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFileUploadControl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-25  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(r88115): Disabling a file upload control causes an endless busyloop.
+        https://bugs.webkit.org/show_bug.cgi?id=66659
+
+        Reviewed by Darin Adler.
+
+        * fast/forms/file/disabling-file-busy-loop-expected.txt: Added.
+        * fast/forms/file/disabling-file-busy-loop.html: Added.
+
 2011-08-29  David Levin  <levin@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-25  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(r88115): Disabling a file upload control causes an endless busyloop.
+        https://bugs.webkit.org/show_bug.cgi?id=66659
+
+        Reviewed by Darin Adler.
+
+        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.
+
 2011-08-29  Daniel Bates  <dbates@webkit.org>
 

trunk/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