[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:48:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e6e817adc92029a55fe533fbcf0f826b5bfadc59
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 9 20:41:11 2002 +0000
WebKit:
- removed unnecessary concept of unique identifiers for bookmarks
* Bookmarks.subproj/WebBookmark.h:
* Bookmarks.subproj/WebBookmark.m:
(-[WebBookmark dealloc]):
(-[WebBookmark _setGroup:]):
* Bookmarks.subproj/WebBookmarkGroup.h:
* Bookmarks.subproj/WebBookmarkGroup.m:
* Bookmarks.subproj/WebBookmarkGroupPrivate.h:
removed all references to unique identifiers
WebBrowser:
- greatly simplified drag-and-drop bookmark code, which will
help me make further refinements more easily
- removed uses of unique bookmark identifiers
- tweaked Library column behaviors with IB
* BookmarksViewController.h: removed _draggedBookmarks ivar; this is now a static variable
* BookmarksViewController.m:
(-[BookmarksViewController dealloc]): don't release _draggedBookmarks, which is now static
(-[BookmarksViewController bookmarkOrAnyAncestor:inArray:]): new method, slight addition
to already-existing anyAncestorOfBookmark:inArray:; replaces code that was checking
bookmark identifiers against a list of identifiers
(-[BookmarksViewController tableView:validateDrop:proposedRow:proposedDropOperation:]),
(-[BookmarksViewController tableView:acceptDrop:row:dropOperation:]),
(-[BookmarksViewController outlineView:validateDrop:proposedItem:proposedChildIndex:]),
(-[BookmarksViewController outlineView:acceptDrop:item:childIndex:]):
Always use draggedImage:endedAt: for deleting original bookmarks; compare against
draggedBookmarks instead of using bookmark identifiers; other simplifications.
* BrowserWebBookmarkExtras.h:
* BrowserWebBookmarkExtras.m:
(+[WebBookmark bookmarkPasteboardTypes]):
(+[WebBookmark writeBookmarks:toPasteboard:withOwner:]):
(+[WebBookmark bookmarksFromPasteboard:]):
Removed bookmarkIdentifiersFromPasteboard and supporting code
* English.lproj/Browser.nib: made single-column not reorderable so it doesn't highlight
* FavoriteButton.m:
(-[FavoriteButton bookmarkMatches:]): new method, compares a bookmark against self's
(-[FavoriteButton determineDragOperation:]): use bookmarkMatches instead of unique
identifiers to test for dropping an item onto itself.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2292 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.h b/WebKit/Bookmarks.subproj/WebBookmark.h
index 031f60a..eb58b4e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.h
+++ b/WebKit/Bookmarks.subproj/WebBookmark.h
@@ -18,7 +18,6 @@ typedef enum {
@interface WebBookmark : NSObject <NSCopying> {
WebBookmark *_parent;
WebBookmarkGroup *_group;
- NSString *_identifier;
}
+ (WebBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group;
@@ -61,8 +60,5 @@ typedef enum {
// The group that this bookmark belongs to.
- (WebBookmarkGroup *)group;
-// An NSString that can be used to uniquely identify this bookmark; use with +[WebBookmarkGroup bookmarkForIdentifier];
-- (NSString *)identifier;
-
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index cfb5e5b..11e98e7 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -19,34 +19,13 @@
@implementation WebBookmark
-static unsigned _highestUsedID = 0;
-
-+ (NSString *)_generateUniqueIdentifier
-{
- return [[NSNumber numberWithInt:++_highestUsedID] stringValue];
-}
-
-- (id)init
-{
- [super init];
- _identifier = [[WebBookmark _generateUniqueIdentifier] copy];
- return self;
-}
-
- (void)dealloc
{
ASSERT(_group == nil);
- [_identifier release];
[super dealloc];
}
-- (NSString *)identifier
-{
- ASSERT(_identifier != nil);
- return [[_identifier copy] autorelease];
-}
-
- (id)copyWithZone:(NSZone *)zone
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
@@ -134,11 +113,9 @@ static unsigned _highestUsedID = 0;
return;
}
- [_group _removedBookmark:self];
[_group release];
_group = [group retain];
- [group _addedBookmark:self];
}
+ (WebBookmark *)bookmarkOfType:(WebBookmarkType)type
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
index d4dd6cc..84fef0c 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
@@ -34,7 +34,6 @@
// examining contents
- (WebBookmark *)topBookmark;
-- (WebBookmark *)bookmarkForIdentifier:(NSString *)identifier;
// modifying contents
- (void)removeBookmark:(WebBookmark *)bookmark;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index c7cfa78..7e3e7d1 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -107,23 +107,6 @@
[self _sendChangeNotificationForBookmark:bookmark childrenChanged:YES];
}
-- (void)_removedBookmark:(WebBookmark *)bookmark
-{
- ASSERT([_bookmarksByID objectForKey:[bookmark identifier]] == bookmark);
- [_bookmarksByID removeObjectForKey:[bookmark identifier]];
-}
-
-- (void)_addedBookmark:(WebBookmark *)bookmark
-{
- ASSERT([_bookmarksByID objectForKey:[bookmark identifier]] == nil);
- [_bookmarksByID setObject:bookmark forKey:[bookmark identifier]];
-}
-
-- (WebBookmark *)bookmarkForIdentifier:(NSString *)identifier
-{
- return [_bookmarksByID objectForKey:identifier];
-}
-
- (void)removeBookmark:(WebBookmark *)bookmark
{
ASSERT_ARG(bookmark, [bookmark group] == self);
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
index 2c9c6c2..2812cd4 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
@@ -14,8 +14,5 @@
- (void)_bookmarkDidChange:(WebBookmark *)bookmark;
- (void)_bookmarkChildrenDidChange:(WebBookmark *)bookmark;
-- (void)_removedBookmark:(WebBookmark *)bookmark;
-- (void)_addedBookmark:(WebBookmark *)bookmark;
-
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c7e27a7..1e3d69f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-10-09 John Sullivan <sullivan at apple.com>
+
+ - removed unnecessary concept of unique identifiers for bookmarks
+
+ * Bookmarks.subproj/WebBookmark.h:
+ * Bookmarks.subproj/WebBookmark.m:
+ (-[WebBookmark dealloc]):
+ (-[WebBookmark _setGroup:]):
+ * Bookmarks.subproj/WebBookmarkGroup.h:
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ * Bookmarks.subproj/WebBookmarkGroupPrivate.h:
+ removed all references to unique identifiers
+
2002-10-09 Darin Adler <darin at apple.com>
WebKit support for creating windows and then showing them later
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c7e27a7..1e3d69f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-09 John Sullivan <sullivan at apple.com>
+
+ - removed unnecessary concept of unique identifiers for bookmarks
+
+ * Bookmarks.subproj/WebBookmark.h:
+ * Bookmarks.subproj/WebBookmark.m:
+ (-[WebBookmark dealloc]):
+ (-[WebBookmark _setGroup:]):
+ * Bookmarks.subproj/WebBookmarkGroup.h:
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ * Bookmarks.subproj/WebBookmarkGroupPrivate.h:
+ removed all references to unique identifiers
+
2002-10-09 Darin Adler <darin at apple.com>
WebKit support for creating windows and then showing them later
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list