Imported WebKit commit fbdeb5a5c78f666271a638ba10137127bcea61f4

Change-Id: Ie14bf4e3f1f1f7e3b9e5cf60e69a7572dd481006
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

4 files changed, 22 insertions, 18 deletions

diff --git a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
index b9c6953fa..edc252d1d 100644
--- a/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQStyle.cpp
@@ -191,21 +191,25 @@ template<typename T>
 static void inflateCheckBoxRectImpl(T& originalRect, const QRect& rect)
 {
     if (!rect.isNull()) {
-        int dx = static_cast<int>((rect.width() - originalRect.width()) / 2);
-        originalRect.setX(originalRect.x() - dx);
-        originalRect.setWidth(rect.width());
-        int dy = static_cast<int>((rect.height() - originalRect.height()) / 2);
-        originalRect.setY(originalRect.y() - dy);
-        originalRect.setHeight(rect.height());
+        if (rect.width() > originalRect.width()) {
+            int dx = static_cast<int>((rect.width() - originalRect.width()) / 2);
+            originalRect.setX(originalRect.x() - dx);
+            originalRect.setWidth(rect.width());
+        }
+        if (rect.height() > originalRect.height()) {
+            int dy = static_cast<int>((rect.height() - originalRect.height()) / 2);
+            originalRect.setY(originalRect.y() - dy);
+            originalRect.setHeight(rect.height());
+        }
     }
 }
 
-void RenderThemeQStyle::computeControlRect(QStyleFacade::ButtonType part, QRect& originalRect) const
+void RenderThemeQStyle::inflateControlRect(QStyleFacade::ButtonType part, QRect& originalRect) const
 {
     inflateCheckBoxRectImpl(originalRect, indicatorRect(part, originalRect));
 }
 
-void RenderThemeQStyle::computeControlRect(QStyleFacade::ButtonType part, FloatRect& originalRect) const
+void RenderThemeQStyle::inflateControlRect(QStyleFacade::ButtonType part, FloatRect& originalRect) const
 {
     inflateCheckBoxRectImpl(originalRect, indicatorRect(part, enclosingIntRect(originalRect)));
 }
@@ -365,10 +369,10 @@ bool RenderThemeQStyle::paintButton(const RenderObject& o, const PaintInfo& i, c
         p.styleOption.rect = inflateButtonRect(p.styleOption.rect);
         p.paintButton(QStyleFacade::PushButton);
     } else if (p.appearance == RadioPart) {
-        computeControlRect(QStyleFacade::RadioButton, p.styleOption.rect);
+        inflateControlRect(QStyleFacade::RadioButton, p.styleOption.rect);
         p.paintButton(QStyleFacade::RadioButton);
     } else if (p.appearance == CheckboxPart) {
-        computeControlRect(QStyleFacade::CheckBox, p.styleOption.rect);
+        inflateControlRect(QStyleFacade::CheckBox, p.styleOption.rect);
         p.paintButton(QStyleFacade::CheckBox);
     }
 
diff --git a/Source/WebCore/platform/qt/RenderThemeQStyle.h b/Source/WebCore/platform/qt/RenderThemeQStyle.h
index d49f5e19b..444f8292e 100644
--- a/Source/WebCore/platform/qt/RenderThemeQStyle.h
+++ b/Source/WebCore/platform/qt/RenderThemeQStyle.h
@@ -94,8 +94,8 @@ protected:
 
     QRect inflateButtonRect(const QRect& originalRect) const override;
     QRectF inflateButtonRect(const QRectF& originalRect) const override;
-    void computeControlRect(QStyleFacade::ButtonType, QRect& originalRect) const override;
-    void computeControlRect(QStyleFacade::ButtonType, FloatRect& originalRect) const override;
+    void inflateControlRect(QStyleFacade::ButtonType, QRect& originalRect) const override;
+    void inflateControlRect(QStyleFacade::ButtonType, FloatRect& originalRect) const override;
 
     void setPopupPadding(RenderStyle&) const override;
 
diff --git a/Source/WebCore/platform/qt/RenderThemeQt.cpp b/Source/WebCore/platform/qt/RenderThemeQt.cpp
index a5a48f92b..442ae9454 100644
--- a/Source/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/Source/WebCore/platform/qt/RenderThemeQt.cpp
@@ -217,11 +217,11 @@ QRectF RenderThemeQt::inflateButtonRect(const QRectF& originalRect) const
     return originalRect;
 }
 
-void RenderThemeQt::computeControlRect(QStyleFacade::ButtonType, QRect&) const
+void RenderThemeQt::inflateControlRect(QStyleFacade::ButtonType, QRect&) const
 {
 }
 
-void RenderThemeQt::computeControlRect(QStyleFacade::ButtonType, FloatRect&) const
+void RenderThemeQt::inflateControlRect(QStyleFacade::ButtonType, FloatRect&) const
 {
 }
 
@@ -229,10 +229,10 @@ void RenderThemeQt::adjustRepaintRect(const RenderObject& o, FloatRect& rect)
 {
     switch (o.style().appearance()) {
     case CheckboxPart:
-        computeControlRect(QStyleFacade::CheckBox, rect);
+        inflateControlRect(QStyleFacade::CheckBox, rect);
         break;
     case RadioPart:
-        computeControlRect(QStyleFacade::RadioButton, rect);
+        inflateControlRect(QStyleFacade::RadioButton, rect);
         break;
     case PushButtonPart:
     case ButtonPart: {
diff --git a/Source/WebCore/platform/qt/RenderThemeQt.h b/Source/WebCore/platform/qt/RenderThemeQt.h
index ee572bace..d38d299af 100644
--- a/Source/WebCore/platform/qt/RenderThemeQt.h
+++ b/Source/WebCore/platform/qt/RenderThemeQt.h
@@ -167,8 +167,8 @@ protected:
 
     virtual QRect inflateButtonRect(const QRect& originalRect) const;
     virtual QRectF inflateButtonRect(const QRectF& originalRect) const;
-    virtual void computeControlRect(QStyleFacade::ButtonType, QRect& originalRect) const;
-    virtual void computeControlRect(QStyleFacade::ButtonType, FloatRect& originalRect) const;
+    virtual void inflateControlRect(QStyleFacade::ButtonType, QRect& originalRect) const;
+    virtual void inflateControlRect(QStyleFacade::ButtonType, FloatRect& originalRect) const;
 
     virtual void setPopupPadding(RenderStyle&) const = 0;