[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2c1a4e15dbb58eb1141ed7b3c1892b0740483071
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 22:30:57 2009 +0000

    2009-12-14  Marco Martin  <notmart at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            In the Scrollbar painting of the Qt theme integration,
            intersects any previous clip rects with the one needed to paint the scrollbar.
            This fixes the painting in QGraphicsview, when the parent of the widget that
            paints the QWebPage has the QGraphicsItem::ItemClipsChildrenToShape set and
            a piece of the scrollbar should be cipped away
            https://bugs.webkit.org/show_bug.cgi?id=30366
    
            No new tests.
    
            * platform/qt/ScrollbarThemeQt.cpp:
            (WebCore::ScrollbarThemeQt::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1575810..8711e01 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-14  Marco Martin  <notmart at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        In the Scrollbar painting of the Qt theme integration,
+        intersects any previous clip rects with the one needed to paint the scrollbar.
+        This fixes the painting in QGraphicsview, when the parent of the widget that 
+        paints the QWebPage has the QGraphicsItem::ItemClipsChildrenToShape set and
+        a piece of the scrollbar should be cipped away
+        https://bugs.webkit.org/show_bug.cgi?id=30366
+
+        No new tests.
+
+        * platform/qt/ScrollbarThemeQt.cpp:
+        (WebCore::ScrollbarThemeQt::paint):
+
 2009-12-14  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/qt/ScrollbarThemeQt.cpp b/WebCore/platform/qt/ScrollbarThemeQt.cpp
index 561e55f..df1c56a 100644
--- a/WebCore/platform/qt/ScrollbarThemeQt.cpp
+++ b/WebCore/platform/qt/ScrollbarThemeQt.cpp
@@ -147,7 +147,7 @@ bool ScrollbarThemeQt::paint(Scrollbar* scrollbar, GraphicsContext* graphicsCont
     p.painter->save();
     QStyleOptionSlider* opt = styleOptionSlider(scrollbar, p.widget);
 
-    p.painter->setClipRect(opt->rect.intersected(damageRect));
+    p.painter->setClipRect(opt->rect.intersected(damageRect), Qt::IntersectClip);
 
 #ifdef Q_WS_MAC
     p.drawComplexControl(QStyle::CC_ScrollBar, *opt);

-- 
WebKit Debian packaging