Changeset 142054 in webkit

Timestamp:

Feb 6, 2013 4:41:07 PM (11 years ago)

Author:

ojan@chromium.org

Message:

display:none file upload button crashes
​https://bugs.webkit.org/show_bug.cgi?id=109102

Reviewed by Levi Weintraub.

Source/WebCore:

Test: fast/forms/file/display-none-upload-button.html

• rendering/RenderFileUploadControl.cpp:

(WebCore::nodeWidth):
(WebCore::RenderFileUploadControl::paintObject):
Having an upload button doesn't mean we have a rendered upload button.
Null check the renderer before trying to access it.

LayoutTests:

• fast/forms/file/display-none-upload-button-expected.txt: Added.
• fast/forms/file/display-none-upload-button.html: Added.

Tests that we don't crash. Also exposes a bug that the baseline and height of
the input don't include the height of the filename text.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/file/display-none-upload-button-expected.txt (added)
• LayoutTests/fast/forms/file/display-none-upload-button.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFileUploadControl.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-06  Ojan Vafai  <ojan@chromium.org>
+
+        display:none file upload button crashes
+        https://bugs.webkit.org/show_bug.cgi?id=109102
+
+        Reviewed by Levi Weintraub.
+
+        * fast/forms/file/display-none-upload-button-expected.txt: Added.
+        * fast/forms/file/display-none-upload-button.html: Added.
+        Tests that we don't crash. Also exposes a bug that the baseline and height of
+        the input don't include the height of the filename text.
+
 2013-02-06  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-06  Ojan Vafai  <ojan@chromium.org>
+
+        display:none file upload button crashes
+        https://bugs.webkit.org/show_bug.cgi?id=109102
+
+        Reviewed by Levi Weintraub.
+
+        Test: fast/forms/file/display-none-upload-button.html
+
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::nodeWidth):
+        (WebCore::RenderFileUploadControl::paintObject):
+        Having an upload button doesn't mean we have a rendered upload button.
+        Null check the renderer before trying to access it.
+
 2013-02-06  Dirk Schulze  <dschulze@adobe.com>
 

trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -90 +90 @@
 static int nodeWidth(Node* node)
 {
-    return node ? node->renderBox()->pixelSnappedWidth() : 0;
+    return (node && node->renderBox()) ? node->renderBox()->pixelSnappedWidth() : 0;
 }
 
@@ -137 +137 @@
         else
             textX = contentLeft + contentWidth() - buttonAndIconWidth - font.width(textRun);
+
+        LayoutUnit textY = 0;
         // We want to match the button's baseline
-        RenderButton* buttonRenderer = toRenderButton(button->renderer());
         // FIXME: Make this work with transforms.
-        LayoutUnit textY = paintOffset.y() + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
+        if (RenderButton* buttonRenderer = toRenderButton(button->renderer()))
+            textY = paintOffset.y() + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
+        else
+            textY = baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
 
         paintInfo.context->setFillColor(style()->visitedDependentColor(CSSPropertyColor), style()->colorSpace());