Changeset 106374 in webkit

Timestamp:

Jan 31, 2012, 11:50:58 AM (15 years ago)

Author:

eae@chromium.org

Message:

Fix scrollbar painting on qt (again).

Location:

branches/subpixellayout/Source/WebCore/platform/qt

Files:

• ScrollbarThemeQt.cpp (modified) (2 diffs)
• ScrollbarThemeQt.h (modified) (1 diff)

branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp

@@ -156 +156 @@
 }
 
-bool ScrollbarThemeQt::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const FixedRect& damageRect)
-{
-    IntRect enclosingRect = enclosingIntRect(damageRect);
+bool ScrollbarThemeQt::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const IntRect& damageRect)
+{
     if (graphicsContext->updatingControlTints()) {
-       scrollbar->invalidateRect(enclosingRect);
+       scrollbar->invalidateRect(damageRect);
        return false;
     }
@@ -171 +170 @@
     QStyleOptionSlider* opt = styleOptionSlider(scrollbar, p.widget);
 
-    p.painter->setClipRect(opt->rect.intersected(enclosingRect), Qt::IntersectClip);
+    p.painter->setClipRect(opt->rect.intersected(damageRect), Qt::IntersectClip);
 
 #ifdef Q_WS_MAC

branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.h

@@ -41 +41 @@
     virtual ~ScrollbarThemeQt();
 
-    virtual bool paint(Scrollbar*, GraphicsContext*, const FixedRect& damageRect);
+    virtual bool paint(Scrollbar*, GraphicsContext*, const IntRect& damageRect);
     virtual void paintScrollCorner(ScrollView*, GraphicsContext*, const IntRect& cornerRect);