Index: Source/core/rendering/RenderFileUploadControl.cpp |
diff --git a/Source/core/rendering/RenderFileUploadControl.cpp b/Source/core/rendering/RenderFileUploadControl.cpp |
index 2f2ce224460c6d1b2c5fd5db93f29812c79b5497..01c8f27ecf9dd4441e882f4c0b2877582ecc6923 100644 |
--- a/Source/core/rendering/RenderFileUploadControl.cpp |
+++ b/Source/core/rendering/RenderFileUploadControl.cpp |
@@ -94,14 +94,14 @@ void RenderFileUploadControl::computeIntrinsicLogicalWidths(LayoutUnit& minLogic |
const UChar character = '0'; |
const String characterAsString = String(&character, 1); |
const Font& font = style()->font(); |
- // FIXME: Remove the need for this const_cast by making constructTextRun take a const RenderObject*. |
+ // FIXME: Remove the need for this const_cast by making constructTextRun take a const LayoutObject*. |
RenderFileUploadControl* renderer = const_cast<RenderFileUploadControl*>(this); |
float minDefaultLabelWidth = defaultWidthNumChars * font.width(constructTextRun(renderer, font, characterAsString, styleRef(), TextRun::AllowTrailingExpansion)); |
const String label = toHTMLInputElement(node())->locale().queryString(WebLocalizedString::FileButtonNoFileSelectedLabel); |
float defaultLabelWidth = font.width(constructTextRun(renderer, font, label, styleRef(), TextRun::AllowTrailingExpansion)); |
if (HTMLInputElement* button = uploadButton()) |
- if (RenderObject* buttonRenderer = button->renderer()) |
+ if (LayoutObject* buttonRenderer = button->renderer()) |
defaultLabelWidth += buttonRenderer->maxPreferredLogicalWidth() + afterButtonSpacing; |
maxLogicalWidth = static_cast<int>(ceilf(std::max(minDefaultLabelWidth, defaultLabelWidth))); |