Changeset 91566 in webkit

Timestamp:

Jul 22, 2011, 6:40:59 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r89535): Form reset does not repaint a file upload control.
​https://bugs.webkit.org/show_bug.cgi?id=65008

Patch by Kentaro Hara <​haraken@google.com> on 2011-07-22
Reviewed by Kent Tamura.

Source/WebCore:

This patch fixes the code so that the file upload control is repainted
in updateFromElement() if no files are selected.

Tests: fast/forms/file-input-reset.html

• rendering/RenderFileUploadControl.cpp:

(WebCore::RenderFileUploadControl::updateFromElement): Calls repaint() if no files are selected.

LayoutTests:

This patch fixes the code so that the file upload control is repainted
in updateFromElement() if no files are selected. The added test checks
if the label next to the file chooser button becomes "No file chosen"
when we press the reset button.

• fast/forms/file-input-reset-expected.html: Added.
• fast/forms/file-input-reset.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/file-input-reset-expected.html (added)
• LayoutTests/fast/forms/file-input-reset.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFileUploadControl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-22  Kentaro Hara  <haraken@google.com>
+
+        REGRESSION(r89535): Form reset does not repaint a file upload control.
+        https://bugs.webkit.org/show_bug.cgi?id=65008
+
+        Reviewed by Kent Tamura.
+
+        This patch fixes the code so that the file upload control is repainted
+        in updateFromElement() if no files are selected. The added test checks
+        if the label next to the file chooser button becomes "No file chosen"
+        when we press the reset button.
+
+        * fast/forms/file-input-reset-expected.html: Added.
+        * fast/forms/file-input-reset.html: Added.
+
 2011-07-22  John Knottenbelt  <jknotten@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-22  Kentaro Hara  <haraken@google.com>
+
+        REGRESSION(r89535): Form reset does not repaint a file upload control.
+        https://bugs.webkit.org/show_bug.cgi?id=65008
+
+        Reviewed by Kent Tamura.
+
+        This patch fixes the code so that the file upload control is repainted
+        in updateFromElement() if no files are selected.
+
+        Tests: fast/forms/file-input-reset.html
+
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::RenderFileUploadControl::updateFromElement): Calls repaint() if no files are selected.
+
 2011-07-22  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -61 +61 @@
 void RenderFileUploadControl::updateFromElement()
 {
+    HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
+    ASSERT(input->isFileUpload());
+
     if (HTMLInputElement* button = uploadButton())
         button->setDisabled(!theme()->isEnabled(this));
+
+    // This only supports clearing out the files, but that's OK because for
+    // security reasons that's the only change the DOM is allowed to make.
+    FileList* files = input->files();
+    ASSERT(files);
+    if (files && files->isEmpty())
+        repaint();
 }