Do not add QStyle padding on top of default padding

The recent change to follow CSS padding value, added the CSS padding
to the default QStyle. This however needlessly changes the default
size of input elements.

This change instead uses the maximum of CSS padding and QStyle padding.

Change-Id: I23a39c76db837409ea11915f69ebbfefa2d25548
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
index f14358c64..999c670c4 100644
--- a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
@@ -155,7 +155,7 @@ QRect RenderThemeQStyle::inflateButtonRect(const QRect& originalRect) const
 
 int extendFixedPadding(Length oldPadding, int padding) {
     if (oldPadding.isFixed()) {
-        return oldPadding.value() + padding;
+        return std::max(oldPadding.intValue(), padding);
     }
     return padding;
 }