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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 4bb612bdc3b8340ecedda6b0e4fb5f80bbcf654d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 9 19:25:01 2002 +0000

    2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
    
            Fix for this bug:
    
            Radar 2890624 (need to remove workaround for double free of image data from QPixmap)
    
            The appropriate, bug-free AppKit code is now available to us on Jaguar.
            Rolling out the workaround.
    
            * kwq/KWQPixmap.mm:
            (QPixmap::QPixmap)
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1119 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9da435b..592c4a3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
+
+        Fix for this bug:
+
+        Radar 2890624 (need to remove workaround for double free of image data from QPixmap)
+
+        The appropriate, bug-free AppKit code is now available to us on Jaguar. 
+        Rolling out the workaround.
+
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap)
+
 === Alexander-3 ===
 
 2002-05-07  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9da435b..592c4a3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
+
+        Fix for this bug:
+
+        Radar 2890624 (need to remove workaround for double free of image data from QPixmap)
+
+        The appropriate, bug-free AppKit code is now available to us on Jaguar. 
+        Rolling out the workaround.
+
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap)
+
 === Alexander-3 ===
 
 2002-05-07  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9da435b..592c4a3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-05-09  Kenneth Kocienda  <kocienda at apple.com>
+
+        Fix for this bug:
+
+        Radar 2890624 (need to remove workaround for double free of image data from QPixmap)
+
+        The appropriate, bug-free AppKit code is now available to us on Jaguar. 
+        Rolling out the workaround.
+
+	* kwq/KWQPixmap.mm:
+	(QPixmap::QPixmap)
+
 === Alexander-3 ===
 
 2002-05-07  Darin Adler  <darin at apple.com>
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index ad18d7d..656a211 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -43,29 +43,12 @@ QPixmap::QPixmap(const QByteArray &bytes)
 {
     NSData *data = [[NSData alloc] initWithBytes: bytes.data() length: bytes.size()];
     nsimage = [[NSImage alloc] initWithData: data];
-    // FIXME: Workaround for Radar 2890624 (Double free of image data in QPixmap)
-    // This else if code block should be removed when we pick up changes from AppKit
-    // image code that are on HEAD now, but are not in Jaguar <= 6B63
-    // When we pick up the change from AppKit, uncomment the next line and release the data here
-    //[data release];
+    [data release];
     if (nsimage == nil){
         KWQDEBUG("unable to create image\n");
-        // FIXME: delete next line when Radar 2890624
-        [data release];
-    }
-    else if ([[nsimage representations] count] == 0) {
-        KWQDEBUG("unable to create image [can't decode bytes]");
-        // if there are no representations, release the image
-        // and return nil
-        // note that the data is freed erroneously by AppKit
-        // we're not leaking that
-        [nsimage release];
-        nsimage = nil;
     }
     else {
         KWQDEBUG("image created");
-        // FIXME: delete next line when Radar 2890624
-        [data release];
         [nsimage setFlipped: YES];
     }
     needCopyOnWrite = false;

-- 
WebKit Debian packaging