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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 7cdfb53a7b34abd01d449d9009907c8693d3bd53
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 1 22:09:42 2002 +0000

    WebKit:
    
    	- some weaning of WebBookmark API from WebBookmarkGroup
    
            * Bookmarks.subproj/WebBookmark.m:
            (-[WebBookmark dealloc]):
    	set group to nil instead of asserting that it's non-nil
    
            * Bookmarks.subproj/WebBookmarkGroup.h:
    	removed obsolete ivar _bookmarksByID
            * Bookmarks.subproj/WebBookmarkGroup.m:
            (-[WebBookmarkGroup initWithFile:]):
    	removed obsolete ivar _bookmarksByID
            (-[WebBookmarkGroup dealloc]):
    	removed obsolete ivar _bookmarksByID
            (-[WebBookmarkGroup removeBookmark:]):
    	removed this unnecessary method; callers need to use
    	[[bookmark parent] removeChild:bookmark] instead
    
    WebBrowser:
    
    	- fixed bug Darin found in my recent checkin that caused rearranging
    	bookmarks in toolbar to fail an assertion in [WebBookmarkGroup removeBookmark:]
    	- fixed a leak I found in the process (bookmark rearranged in toolbar
    	would leak)
    
            * BookmarksController.m:
            (-[BookmarksController updateBookmarkSources]):
    	use [[bookmark parent] removeChild:bookmark] instead of
    	now-obsolete [[bookmark group] removeBookmark:bookmark]
    
            * BookmarksViewController.m:
            (-[BookmarksViewController removeBookmarks:]),
            (-[BookmarksViewController redoRemoveBookmarks:]),
            (-[BookmarksViewController undoNewBookmark:]),
            (-[BookmarksViewController moveBookmarks:toNewFolder:]):
    	use [[bookmark parent] removeChild:bookmark] instead of
    	now-obsolete [[bookmark group] removeBookmark:bookmark]
    
            * BrowserWebBookmarkExtras.m:
            (-[WebBookmark deleteWithUndo]):
    	use [[bookmark parent] removeChild:bookmark] instead of
    	now-obsolete [[bookmark group] removeBookmark:bookmark]
    
            * FavoriteButton.m:
            (-[FavoriteButton draggedImage:endedAt:operation:]):
    	don't use undoable delete in the drag-to-rearrange case;
    	added FIXME explaining why
    
            * FavoritesBar.m:
            (-[FavoritesBar deleteFavoritesWithURLsMatchingBookmarks:]),
            (-[FavoritesBar titleChangeSheetDidEnd:returnCode:contextInfo:]):
    	use [[bookmark parent] removeChild:bookmark] instead of
    	now-obsolete [[bookmark group] removeBookmark:bookmark]
            (-[FavoritesBar performDragOperation:]):
    	autorelease the copy of the bookmark in the dragged FavoriteButton
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2530 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index 23b3a97..c1c22e1 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -21,8 +21,8 @@
 @implementation WebBookmark
 
 - (void)dealloc
-{
-    ASSERT(_group == nil);
+{    
+    [_group release];
     [_identifier release];
     
     [super dealloc];
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
index 84fef0c..4ca03a6 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
@@ -25,7 +25,6 @@
 {
     NSString *_file;
     WebBookmark *_topBookmark;
-    NSMutableDictionary *_bookmarksByID;
     BOOL _loading;
 }
 
@@ -36,8 +35,6 @@
 - (WebBookmark *)topBookmark;
 
 // modifying contents
-- (void)removeBookmark:(WebBookmark *)bookmark;
-
 - (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
                               ofBookmark:(WebBookmark *)parent
                                withTitle:(NSString *)newTitle
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 8cfd951..2297bd5 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -31,8 +31,6 @@
         return nil;
     }
 
-    _bookmarksByID = [[NSMutableDictionary alloc] init];
-
     _file = [file copy];
     [self _setTopBookmark:nil];
 
@@ -46,7 +44,6 @@
 {
     [_file release];
     [_topBookmark release];
-    [_bookmarksByID release];
     [super dealloc];
 }
 
@@ -108,21 +105,6 @@
     [self _sendChangeNotificationForBookmark:bookmark childrenChanged:YES];
 }
 
-- (void)removeBookmark:(WebBookmark *)bookmark
-{
-    ASSERT_ARG(bookmark, [bookmark group] == self);
-    ASSERT_ARG(bookmark, [bookmark parent] != nil || bookmark == _topBookmark);
-
-    if (bookmark == _topBookmark) {
-        [self _setTopBookmark:nil];
-    } else {
-        [bookmark retain];
-        [[bookmark parent] removeChild:bookmark];
-        [bookmark _setGroup:nil];
-        [bookmark release];
-    }
-}
-
 - (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
                                withTitle:(NSString *)newTitle
                                URLString:(NSString *)newURLString
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 92d05b7..7d04c3d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2002-11-01  John Sullivan  <sullivan at apple.com>
+
+	- some weaning of WebBookmark API from WebBookmarkGroup
+
+        * Bookmarks.subproj/WebBookmark.m:
+        (-[WebBookmark dealloc]):
+	set group to nil instead of asserting that it's non-nil
+
+        * Bookmarks.subproj/WebBookmarkGroup.h:
+	removed obsolete ivar _bookmarksByID
+        * Bookmarks.subproj/WebBookmarkGroup.m:
+        (-[WebBookmarkGroup initWithFile:]):
+	removed obsolete ivar _bookmarksByID
+        (-[WebBookmarkGroup dealloc]):
+	removed obsolete ivar _bookmarksByID
+        (-[WebBookmarkGroup removeBookmark:]):
+	removed this unnecessary method; callers need to use
+	[[bookmark parent] removeChild:bookmark] instead
+
 2002-11-01  Trey Matteson  <trey at apple.com>
 
 	Moved involved code for loading URLs from WebBridge up to WebFrame, with a little
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 92d05b7..7d04c3d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,22 @@
+2002-11-01  John Sullivan  <sullivan at apple.com>
+
+	- some weaning of WebBookmark API from WebBookmarkGroup
+
+        * Bookmarks.subproj/WebBookmark.m:
+        (-[WebBookmark dealloc]):
+	set group to nil instead of asserting that it's non-nil
+
+        * Bookmarks.subproj/WebBookmarkGroup.h:
+	removed obsolete ivar _bookmarksByID
+        * Bookmarks.subproj/WebBookmarkGroup.m:
+        (-[WebBookmarkGroup initWithFile:]):
+	removed obsolete ivar _bookmarksByID
+        (-[WebBookmarkGroup dealloc]):
+	removed obsolete ivar _bookmarksByID
+        (-[WebBookmarkGroup removeBookmark:]):
+	removed this unnecessary method; callers need to use
+	[[bookmark parent] removeChild:bookmark] instead
+
 2002-11-01  Trey Matteson  <trey at apple.com>
 
 	Moved involved code for loading URLs from WebBridge up to WebFrame, with a little

-- 
WebKit Debian packaging