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

[reni at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f52cc5f6fb9382baed6cc42c2f1b58fac54d6d5f
Author: reni at webkit.org <reni at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 13:40:11 2010 +0000

    [Qt] Leak with GraphicsContext::takeOwnershipOfPlatformContext()
    https://bugs.webkit.org/show_bug.cgi?id=49916
    
    Reviewed by Andreas Kling.
    
    Change the order of calling QPainter::device() and QPainter::end(), so device() will return with a valid device.
    No new test is needed.
    
    * platform/graphics/qt/GraphicsContextQt.cpp:
    (WebCore::GraphicsContextPlatformPrivate::~GraphicsContextPlatformPrivate):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5da7786..0c912b0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-30  Renata Hodovan  <reni at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Leak with GraphicsContext::takeOwnershipOfPlatformContext()
+        https://bugs.webkit.org/show_bug.cgi?id=49916
+
+        Change the order of calling QPainter::device() and QPainter::end(), so device() will return with a valid device.
+        No new test is needed.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContextPlatformPrivate::~GraphicsContextPlatformPrivate):
+
 2010-11-30  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index eafbc15..86dabe1 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -258,8 +258,8 @@ GraphicsContextPlatformPrivate::~GraphicsContextPlatformPrivate()
     if (!platformContextIsOwned)
         return;
 
-    painter->end();
     QPaintDevice* device = painter->device();
+    painter->end();
     delete painter;
     delete device;
 }

-- 
WebKit Debian packaging