[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 04b400a8461ad554a5c5863d6f2aeff941cf0f3e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 07:36:44 2010 +0000

    2010-02-11  Ariya Hidayat  <ariya.hidayat at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Use clipRegion instead of clipPath to save lots of CPU cycles.
    
            https://bugs.webkit.org/show_bug.cgi?id=32375
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::clipOut):
            (WebCore::GraphicsContext::clipOutEllipseInRect):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9120932..9e1247a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-11  Ariya Hidayat  <ariya.hidayat at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Use clipRegion instead of clipPath to save lots of CPU cycles.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32375
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::clipOut):
+        (WebCore::GraphicsContext::clipOutEllipseInRect):
+
 2010-02-11  Yuzo Fujishima  <yuzo at google.com>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 736062c..105d866 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -949,7 +949,7 @@ void GraphicsContext::clipOut(const Path& path)
     QPainterPath newClip;
     newClip.setFillRule(Qt::OddEvenFill);
     if (p->hasClipping()) {
-        newClip.addRect(p->clipPath().boundingRect());
+        newClip.addRect(p->clipRegion().boundingRect());
         newClip.addPath(clippedOut);
         p->setClipPath(newClip, Qt::IntersectClip);
     } else {
@@ -1018,7 +1018,7 @@ void GraphicsContext::clipOut(const IntRect& rect)
     QPainterPath newClip;
     newClip.setFillRule(Qt::OddEvenFill);
     if (p->hasClipping()) {
-        newClip.addRect(p->clipPath().boundingRect());
+        newClip.addRect(p->clipRegion().boundingRect());
         newClip.addRect(QRect(rect));
         p->setClipPath(newClip, Qt::IntersectClip);
     } else {
@@ -1040,7 +1040,7 @@ void GraphicsContext::clipOutEllipseInRect(const IntRect& rect)
     QPainterPath newClip;
     newClip.setFillRule(Qt::OddEvenFill);
     if (p->hasClipping()) {
-        newClip.addRect(p->clipPath().boundingRect());
+        newClip.addRect(p->clipRegion().boundingRect());
         newClip.addEllipse(QRect(rect));
         p->setClipPath(newClip, Qt::IntersectClip);
     } else {

-- 
WebKit Debian packaging