[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 1ec050346118132249ee748f06d04eed71201cf6
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 11:42:36 2010 +0000

    2010-08-04  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Use a QImage for the stroke applier scratch context
    
            This avoids leaking a server-side resource on some graphics systems.
    
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::scratchContext):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 669f3b7..c0c3ec5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-04  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Use a QImage for the stroke applier scratch context
+
+        This avoids leaking a server-side resource on some graphics systems.
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::scratchContext):
+
 2010-08-03  Ben Murdoch  <benm at google.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index a8adb31..de9de07 100644
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -123,8 +123,10 @@ bool Path::contains(const FloatPoint& point, WindRule rule) const
 
 static GraphicsContext* scratchContext()
 {
-    static ImageBuffer* scratch = ImageBuffer::create(IntSize(1, 1)).leakPtr();
-    return scratch->context();
+    static QImage image(1, 1, QImage::Format_ARGB32_Premultiplied);
+    static QPainter painter(&image);
+    static GraphicsContext* context = new GraphicsContext(&painter);
+    return context;
 }
 
 bool Path::strokeContains(StrokeStyleApplier* applier, const FloatPoint& point) const

-- 
WebKit Debian packaging