Changeset 37377

Timestamp:

10/07/08 09:30:40 (7 weeks ago)

Author:

vestbo@webkit.org

Message:

2008-10-07 Tor Arne Vestbø <tavestbo@trolltech.com>

Reviewed by Simon.

Don't attempt to paint when updating control tints

We don't have a valid PlatformGraphicsContext so schedule
the dirty scrollbar/scrollview area for repaint instead.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/ScrollbarThemeQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-07  Tor Arne VestbÞ  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+
+        Don't attempt to paint when updating control tints
+
+        We don't have a valid PlatformGraphicsContext so schedule
+        the dirty scrollbar/scrollview area for repaint instead.
+
+        * platform/qt/ScrollbarThemeQt.cpp:
+        (WebCore::ScrollbarThemeQt::paint):
+        (WebCore::ScrollbarThemeQt::paintScrollCorner):
+
 2008-10-07  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/platform/qt/ScrollbarThemeQt.cpp

@@ -32 +32 @@
 #include "PlatformMouseEvent.h"
 #include "Scrollbar.h"
+#include "ScrollView.h"
 
 #include <QApplication>
@@ -126 +127 @@
 bool ScrollbarThemeQt::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const IntRect& damageRect)
 {
+    if (graphicsContext->updatingControlTints()) {
+       scrollbar->invalidateRect(damageRect);
+       return false;
+    }
+
     QStyleOptionSlider* opt = styleOptionSlider(scrollbar);
     QRect clip = opt->rect.intersected(damageRect);
@@ -211 +217 @@
 }
 
-void ScrollbarThemeQt::paintScrollCorner(ScrollView*, GraphicsContext* context, const IntRect& rect)
-{
+void ScrollbarThemeQt::paintScrollCorner(ScrollView* scrollView, GraphicsContext* context, const IntRect& rect)
+{
+    if (context->updatingControlTints()) {
+       scrollView->invalidateRect(rect);
+       return;
+    }
+
 #if QT_VERSION < 0x040500
     context->fillRect(rect, QApplication::palette().color(QPalette::Normal, QPalette::Window));