diff options
Diffstat (limited to 'WebCore/rendering/RenderFileUploadControl.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFileUploadControl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderFileUploadControl.cpp b/WebCore/rendering/RenderFileUploadControl.cpp index cbf1409..33ffd98 100644 --- a/WebCore/rendering/RenderFileUploadControl.cpp +++ b/WebCore/rendering/RenderFileUploadControl.cpp @@ -22,6 +22,7 @@ #include "RenderFileUploadControl.h" #include "FileList.h" +#include "Frame.h" #include "FrameView.h" #include "GraphicsContext.h" #include "HTMLInputElement.h" @@ -73,7 +74,7 @@ RenderFileUploadControl::~RenderFileUploadControl() m_fileChooser->disconnectClient(); } -void RenderFileUploadControl::styleDidChange(RenderStyle::Diff diff, const RenderStyle* oldStyle) +void RenderFileUploadControl::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) { RenderBlock::styleDidChange(diff, oldStyle); if (m_button) @@ -157,7 +158,7 @@ int RenderFileUploadControl::maxFilenameWidth() const PassRefPtr<RenderStyle> RenderFileUploadControl::createButtonStyle(const RenderStyle* parentStyle) const { - RefPtr<RenderStyle> style = getCachedPseudoStyle(RenderStyle::FILE_UPLOAD_BUTTON); + RefPtr<RenderStyle> style = getCachedPseudoStyle(FILE_UPLOAD_BUTTON); if (!style) { style = RenderStyle::create(); if (parentStyle) @@ -202,7 +203,7 @@ void RenderFileUploadControl::paintObject(PaintInfo& paintInfo, int tx, int ty) else textX = contentLeft + contentWidth() - buttonAndIconWidth - style()->font().width(textRun); // We want to match the button's baseline - RenderButton* buttonRenderer = static_cast<RenderButton*>(m_button->renderer()); + RenderButton* buttonRenderer = toRenderButton(m_button->renderer()); int textY = buttonRenderer->absoluteBoundingBoxRect().y() + buttonRenderer->marginTop() + buttonRenderer->borderTop() + buttonRenderer->paddingTop() + buttonRenderer->baselinePosition(true, false); |