diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/rendering/RenderFileUploadControl.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/rendering/RenderFileUploadControl.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderFileUploadControl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderFileUploadControl.cpp b/Source/WebCore/rendering/RenderFileUploadControl.cpp index 3c10f43..3e4d216 100644 --- a/Source/WebCore/rendering/RenderFileUploadControl.cpp +++ b/Source/WebCore/rendering/RenderFileUploadControl.cpp @@ -32,6 +32,7 @@ #include "Icon.h" #include "LocalizedStrings.h" #include "Page.h" +#include "PaintInfo.h" #include "RenderButton.h" #include "RenderText.h" #include "RenderTheme.h" @@ -74,8 +75,6 @@ void RenderFileUploadControl::styleDidChange(StyleDifference diff, const RenderS RenderBlock::styleDidChange(diff, oldStyle); if (m_button) m_button->renderer()->setStyle(createButtonStyle(style())); - - setReplaced(isInline()); } void RenderFileUploadControl::valueChanged() |