[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:58:09 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 3e0be03360c6e2a1ca754eb1a79ce5fcc7de4d24
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 8 19:08:39 2002 +0000

            Cleanup of fix to 3083281.  Never call stopAnimating from
            QPixmap's destructor.  With the fix it wouldn't have been
            called anyway.
    
            * kwq/KWQPixmap.mm:
            (QPixmap::~QPixmap):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fca8016..9f66c59 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-08  Richard Williamson   <rjw at apple.com>
+
+        Cleanup of fix to 3083281.  Never call stopAnimating from
+        QPixmap's destructor.  With the fix it wouldn't have been
+        called anyway.
+        
+        * kwq/KWQPixmap.mm:
+        (QPixmap::~QPixmap):
+
 2002-11-08  Darin Adler  <darin at apple.com>
 
         * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fca8016..9f66c59 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-08  Richard Williamson   <rjw at apple.com>
+
+        Cleanup of fix to 3083281.  Never call stopAnimating from
+        QPixmap's destructor.  With the fix it wouldn't have been
+        called anyway.
+        
+        * kwq/KWQPixmap.mm:
+        (QPixmap::~QPixmap):
+
 2002-11-08  Darin Adler  <darin at apple.com>
 
         * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fca8016..9f66c59 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-08  Richard Williamson   <rjw at apple.com>
+
+        Cleanup of fix to 3083281.  Never call stopAnimating from
+        QPixmap's destructor.  With the fix it wouldn't have been
+        called anyway.
+        
+        * kwq/KWQPixmap.mm:
+        (QPixmap::~QPixmap):
+
 2002-11-08  Darin Adler  <darin at apple.com>
 
         * kwq/WebCoreBridge.mm: (attributedString): Remove some dead code.
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index 0ef3d78..a6269b3 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -61,8 +61,6 @@ QPixmap::QPixmap(const QPixmap &copyFrom) : QPaintDevice(copyFrom)
 
 QPixmap::~QPixmap()
 {
-    if ([imageRenderer retainCount] == 1)
-        [imageRenderer stopAnimation];
     [imageRenderer release];
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list