Title: [106374] branches/subpixellayout/Source/WebCore/platform/qt
- Revision
- 106374
- Author
- [email protected]
- Date
- 2012-01-31 11:50:58 -0800 (Tue, 31 Jan 2012)
Log Message
Fix scrollbar painting on qt (again).
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp (106373 => 106374)
--- branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp 2012-01-31 19:33:22 UTC (rev 106373)
+++ branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp 2012-01-31 19:50:58 UTC (rev 106374)
@@ -155,11 +155,10 @@
return &opt;
}
-bool ScrollbarThemeQt::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const FixedRect& damageRect)
+bool ScrollbarThemeQt::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const IntRect& damageRect)
{
- IntRect enclosingRect = enclosingIntRect(damageRect);
if (graphicsContext->updatingControlTints()) {
- scrollbar->invalidateRect(enclosingRect);
+ scrollbar->invalidateRect(damageRect);
return false;
}
@@ -170,7 +169,7 @@
p.painter->save();
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
// FIXME: We also need to check the widget style but today ScrollbarTheme is not aware of the page so we
Modified: branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.h (106373 => 106374)
--- branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.h 2012-01-31 19:33:22 UTC (rev 106373)
+++ branches/subpixellayout/Source/WebCore/platform/qt/ScrollbarThemeQt.h 2012-01-31 19:50:58 UTC (rev 106374)
@@ -40,7 +40,7 @@
public:
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);
virtual ScrollbarPart hitTest(Scrollbar*, const PlatformMouseEvent&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
