[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[beidson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 61550845f403e2812fac49a31236270a0d7e78ec
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 17:25:39 2010 +0000

    REGRESSION (31281): -[WebArchive initWithCoder:] leaks
    <rdar://problem/7702420> and https://bugs.webkit.org/show_bug.cgi?id=35534
    
    Reviewed by Geoff Garen.
    
    * WebView/WebArchive.mm:
    (-[WebArchive initWithCoder:]): Don't retain objects we don't own.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ca1d0ef..ce5de75 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-04  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        REGRESSION (31281): -[WebArchive initWithCoder:] leaks
+        <rdar://problem/7702420> and https://bugs.webkit.org/show_bug.cgi?id=35534
+
+        * WebView/WebArchive.mm:
+        (-[WebArchive initWithCoder:]): Don't retain objects we don't own.
+
 2010-03-03  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/mac/WebView/WebArchive.mm b/WebKit/mac/WebView/WebArchive.mm
index 89c8335..86e29c8 100644
--- a/WebKit/mac/WebView/WebArchive.mm
+++ b/WebKit/mac/WebView/WebArchive.mm
@@ -239,13 +239,13 @@ static BOOL isArrayOfClass(id object, Class elementClass)
     @try {
         id object = [decoder decodeObjectForKey:WebMainResourceKey];
         if ([object isKindOfClass:[WebResource class]])
-            mainResource = [object retain];
+            mainResource = object;
         object = [decoder decodeObjectForKey:WebSubresourcesKey];
         if (isArrayOfClass(object, [WebResource class]))
-            subresources = [object retain];
+            subresources = object;
         object = [decoder decodeObjectForKey:WebSubframeArchivesKey];
         if (isArrayOfClass(object, [WebArchive class]))
-            subframeArchives = [object retain];
+            subframeArchives = object;
     } @catch(id) {
         [self release];
         return nil;

-- 
WebKit Debian packaging