Changeset 136915 in webkit

Timestamp:

Dec 6, 2012, 6:18:01 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Disabled file input box stops a certain other div from being rendered
​https://bugs.webkit.org/show_bug.cgi?id=104226

Patch by Kunihiko Sakamoto <​ksakamoto@chromium.org> on 2012-12-06
Reviewed by Dimitri Glazkov.

Source/WebCore:

The bug was caused by setNeedsStyleRecalc() call during style recalculation,
which resulted in inconsistent ChildNeedsStyleRecalc flags in DOM tree.

When reattach of file input happens during style recalculation,
RenderFileUploadControl::updateFromElement() is called from attach().
It may change the disabled state of the upload button in its shadow tree,
but it triggers style recalculation.

This patch solves this issue by setting disabled state of the upload button in
FileInputType::disabledAttributeChanged instead of RenderFileUploadControl.

Test: fast/forms/file/sibling-of-disabled-file-input.html

• html/FileInputType.cpp:

(WebCore::FileInputType::disabledAttributeChanged): Added.

• html/FileInputType.h:

(FileInputType): Declare disabledAttributeChanged.

• rendering/RenderFileUploadControl.cpp:

(WebCore::RenderFileUploadControl::updateFromElement): Remove call to button->setDisabled().

LayoutTests:

Add a test to ensure that sibling of disabled file input is correctly rendered.

• fast/forms/file/sibling-of-disabled-file-input-expected.txt: Added.
• fast/forms/file/sibling-of-disabled-file-input.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/file/sibling-of-disabled-file-input-expected.txt (added)
• LayoutTests/fast/forms/file/sibling-of-disabled-file-input.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/FileInputType.cpp (modified) (1 diff)
• Source/WebCore/html/FileInputType.h (modified) (1 diff)
• Source/WebCore/rendering/RenderFileUploadControl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-06  Kunihiko Sakamoto  <ksakamoto@chromium.org>
+
+        Disabled file input box stops a certain other div from being rendered
+        https://bugs.webkit.org/show_bug.cgi?id=104226
+
+        Reviewed by Dimitri Glazkov.
+
+        Add a test to ensure that sibling of disabled file input is correctly rendered.
+
+        * fast/forms/file/sibling-of-disabled-file-input-expected.txt: Added.
+        * fast/forms/file/sibling-of-disabled-file-input.html: Added.
+
 2012-12-06  Dominic Cooney  <dominicc@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-06  Kunihiko Sakamoto  <ksakamoto@chromium.org>
+
+        Disabled file input box stops a certain other div from being rendered
+        https://bugs.webkit.org/show_bug.cgi?id=104226
+
+        Reviewed by Dimitri Glazkov.
+
+        The bug was caused by setNeedsStyleRecalc() call during style recalculation,
+        which resulted in inconsistent ChildNeedsStyleRecalc flags in DOM tree.
+
+        When reattach of file input happens during style recalculation,
+        RenderFileUploadControl::updateFromElement() is called from attach().
+        It may change the disabled state of the upload button in its shadow tree,
+        but it triggers style recalculation.
+
+        This patch solves this issue by setting disabled state of the upload button in
+        FileInputType::disabledAttributeChanged instead of RenderFileUploadControl.
+
+        Test: fast/forms/file/sibling-of-disabled-file-input.html
+
+        * html/FileInputType.cpp:
+        (WebCore::FileInputType::disabledAttributeChanged): Added.
+        * html/FileInputType.h:
+        (FileInputType): Declare disabledAttributeChanged.
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::updateFromElement): Remove call to button->setDisabled().
+
 2012-12-06  Dominic Cooney  <dominicc@chromium.org>
 

trunk/Source/WebCore/html/FileInputType.cpp

@@ -307 +307 @@
 }
 
+void FileInputType::disabledAttributeChanged()
+{
+    ASSERT(element()->shadow());
+    UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->userAgentShadowRoot()->firstChild());
+    if (button)
+        button->setDisabled(element()->disabled());
+}
+
 void FileInputType::multipleAttributeChanged()
 {

trunk/Source/WebCore/html/FileInputType.h

@@ -72 +72 @@
     virtual bool isFileUpload() const OVERRIDE;
     virtual void createShadowSubtree() OVERRIDE;
+    virtual void disabledAttributeChanged() OVERRIDE;
     virtual void multipleAttributeChanged() OVERRIDE;
     virtual String defaultToolTip() const OVERRIDE;

trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -73 +73 @@
 
     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);
-
         bool newCanReceiveDroppedFilesState = input->canReceiveDroppedFiles();
         if (m_canReceiveDroppedFiles != newCanReceiveDroppedFilesState) {