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

trey trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:02:28 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 00178efefec4c0d55ec605dc724434e82b96b21f
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 18 06:47:07 2002 +0000

    	Code cleanup to make some internal methods return autoreleased objects.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _addBackForwardItemClippedAtTarget:]):
            (-[WebFrame _createItem]):
            (-[WebFrame _createItemTreeWithTargetFrame:clippedAtTarget:]):
            (-[WebFrame _transitionToCommitted]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5841675..b2e7f88 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-11-17  Trey Matteson  <trey at apple.com>
 
+	Code cleanup to make some internal methods return autoreleased objects.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _addBackForwardItemClippedAtTarget:]):
+        (-[WebFrame _createItem]):
+        (-[WebFrame _createItemTreeWithTargetFrame:clippedAtTarget:]):
+        (-[WebFrame _transitionToCommitted]):
+
+2002-11-17  Trey Matteson  <trey at apple.com>
+
 	Fixed 3102076 - REGRESSION: infinite recursion involving bridge end
 	Fixed 3100929 - REGRESSION: serverRedirectedForDataSource: not sent on server redirects
 	Fixed 3103381 - REGRESSION: Going back from anchor doesn't restore scroll position
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5841675..b2e7f88 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-17  Trey Matteson  <trey at apple.com>
 
+	Code cleanup to make some internal methods return autoreleased objects.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _addBackForwardItemClippedAtTarget:]):
+        (-[WebFrame _createItem]):
+        (-[WebFrame _createItemTreeWithTargetFrame:clippedAtTarget:]):
+        (-[WebFrame _transitionToCommitted]):
+
+2002-11-17  Trey Matteson  <trey at apple.com>
+
 	Fixed 3102076 - REGRESSION: infinite recursion involving bridge end
 	Fixed 3100929 - REGRESSION: serverRedirectedForDataSource: not sent on server redirects
 	Fixed 3103381 - REGRESSION: Going back from anchor doesn't restore scroll position
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index bada4d4..4e8533b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -160,11 +160,9 @@ static const char * const stateNames[] = {
 {
     WebHistoryItem *bfItem = [[[self controller] mainFrame] _createItemTreeWithTargetFrame:self clippedAtTarget:doClip];
     [[[self controller] backForwardList] addEntry:bfItem];
-    [bfItem release];
     return bfItem;
 }
 
-// NB: this returns an object with retain count of 1
 - (WebHistoryItem *)_createItem
 {
     WebDataSource *dataSrc = [self dataSource];
@@ -177,13 +175,12 @@ static const char * const stateNames[] = {
     [_private setPreviousItem:[_private currentItem]];
     [_private setCurrentItem:bfItem];
 
-    return bfItem;
+    return [bfItem autorelease];
 }
 
 /*
     In the case of saving state about a page with frames, we store a tree of items that mirrors the frame tree.  The item that was the target of the user's navigation is designated as the "targetItem".  When this method is called with doClip=YES we're able to create the whole tree except for the target's children, which will be loaded in the future.  That part of the tree will be filled out as the child loads are committed.
 */
-// NB: this returns an object with retain count of 1
 - (WebHistoryItem *)_createItemTreeWithTargetFrame:(WebFrame *)targetFrame clippedAtTarget:(BOOL)doClip
 {
     WebHistoryItem *bfItem = [self _createItem];
@@ -199,7 +196,6 @@ static const char * const stateNames[] = {
                 WebFrame *child = [_private->children objectAtIndex:i];
                 WebHistoryItem *childItem = [child _createItemTreeWithTargetFrame:targetFrame clippedAtTarget:doClip];
                 [bfItem addChildItem:childItem];
-                [childItem release];
             }
         }
     }
@@ -478,7 +474,6 @@ static const char * const stateNames[] = {
                     WebHistoryItem *item = [self _createItem];
                     ASSERT([[self parent]->_private currentItem]);
                     [[[self parent]->_private currentItem] addChildItem:item];
-                    [item release];
                     [[self webView] _makeDocumentViewForDataSource:ds];
                     }
                     break;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list