[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:36:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6e48f21ce953de5cb59dd9dadf1872496548fa72
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 4 20:50:38 2002 +0000
WebKit:
Removed the now-unnecessary iconURL from bookmarks and history.
* Bookmarks.subproj/WebBookmark.h:
* Bookmarks.subproj/WebBookmark.m:
* Bookmarks.subproj/WebBookmarkGroup.h:
* Bookmarks.subproj/WebBookmarkGroup.m:
* Bookmarks.subproj/WebBookmarkLeaf.h:
* Bookmarks.subproj/WebBookmarkLeaf.m:
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.h:
* History.subproj/WebHistoryItem.m:
* History.subproj/WebHistoryPrivate.h:
* History.subproj/WebHistoryPrivate.m:
Removed iconURL instance variables, methods, and parameters.
WebBrowser:
Update users of bookmark or history APIs from WebKit that no longer take an iconURL.
* BookmarksController.m:
(-[BookmarksController _blessOrCreateFavoritesRoot]):
* BookmarksViewController.m:
(-[BookmarksViewController newItemWithTitle:URLString:type:positionIgnoresSelection:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler receivedPageTitle:forDataSource:]):
Removed iconURL parameters.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.h b/WebKit/Bookmarks.subproj/WebBookmark.h
index bcdf08e..caf348e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.h
+++ b/WebKit/Bookmarks.subproj/WebBookmark.h
@@ -33,9 +33,6 @@ typedef enum {
- (NSImage *)icon;
-- (NSURL *)iconURL;
-- (void)setIconURL:(NSURL *)iconURL;
-
// The type of bookmark
- (WebBookmarkType)bookmarkType;
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index 33aadae..17775b3 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -71,17 +71,6 @@ static unsigned _highestUsedID = 0;
return nil;
}
-- (NSURL *)iconURL
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return nil;
-}
-
-- (void)setIconURL:(NSURL *)iconURL
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
-}
-
- (WebBookmarkType)bookmarkType
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
index bb8ebf4..d4dd6cc 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
@@ -42,12 +42,10 @@
- (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
ofBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
- iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType;
- (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
- iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 7d2e414..792c3fb 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -140,14 +140,12 @@
- (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
- iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType
{
return [self insertNewBookmarkAtIndex:[parent numberOfChildren]
ofBookmark:parent
withTitle:newTitle
- iconURL:iconURL
URLString:newURLString
type:bookmarkType];
}
@@ -155,7 +153,6 @@
- (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
ofBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
- iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType
{
@@ -168,7 +165,6 @@
if (bookmarkType == WebBookmarkTypeLeaf) {
bookmark = [[WebBookmarkLeaf alloc] initWithURLString:newURLString
title:newTitle
- iconURL:iconURL
group:self];
} else if (bookmarkType == WebBookmarkTypeSeparator) {
bookmark = [[WebBookmarkSeparator alloc] initWithGroup:self];
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h
index 0e4c684..3d4233e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h
@@ -17,7 +17,6 @@
- (id)initWithURLString:(NSString *)URLString
title:(NSString *)title
- iconURL:(NSURL *)iconURL
group:(WebBookmarkGroup *)group;
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index f53e617..1a24dce 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -29,7 +29,6 @@
- (id)initWithURLString:(NSString *)URLString
title:(NSString *)title
- iconURL:(NSURL *)iconURL
group:(WebBookmarkGroup *)group;
{
[self init];
@@ -38,7 +37,6 @@
// just hang onto the string separately and don't bother creating
// an NSURL object for the WebHistoryItem.
[self setTitle:title];
- [self setIconURL:iconURL];
[self setURLString:URLString];
[self _setGroup:group];
@@ -86,7 +84,6 @@
{
return [[WebBookmarkLeaf allocWithZone:zone] initWithURLString:_URLString
title:[self title]
- iconURL:[self iconURL]
group:[self group]];
}
@@ -112,17 +109,6 @@
return [_entry icon];
}
-- (NSURL *)iconURL
-{
- return [_entry iconURL];
-}
-
-- (void)setIconURL:(NSURL *)iconURL
-{
- [_entry setIconURL:iconURL];
- [[self group] _bookmarkDidChange:self];
-}
-
- (WebBookmarkType)bookmarkType
{
return WebBookmarkTypeLeaf;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3ca850c..2ef3587 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,23 @@
2002-09-04 Darin Adler <darin at apple.com>
+ Removed the now-unnecessary iconURL from bookmarks and history.
+
+ * Bookmarks.subproj/WebBookmark.h:
+ * Bookmarks.subproj/WebBookmark.m:
+ * Bookmarks.subproj/WebBookmarkGroup.h:
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ * Bookmarks.subproj/WebBookmarkLeaf.h:
+ * Bookmarks.subproj/WebBookmarkLeaf.m:
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+ * History.subproj/WebHistoryItem.h:
+ * History.subproj/WebHistoryItem.m:
+ * History.subproj/WebHistoryPrivate.h:
+ * History.subproj/WebHistoryPrivate.m:
+ Removed iconURL instance variables, methods, and parameters.
+
+2002-09-04 Darin Adler <darin at apple.com>
+
Did some minor plugin cleanup, mostly to make sure we don't
change pages while a plugin is tracking.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3ca850c..2ef3587 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,23 @@
2002-09-04 Darin Adler <darin at apple.com>
+ Removed the now-unnecessary iconURL from bookmarks and history.
+
+ * Bookmarks.subproj/WebBookmark.h:
+ * Bookmarks.subproj/WebBookmark.m:
+ * Bookmarks.subproj/WebBookmarkGroup.h:
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ * Bookmarks.subproj/WebBookmarkLeaf.h:
+ * Bookmarks.subproj/WebBookmarkLeaf.m:
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+ * History.subproj/WebHistoryItem.h:
+ * History.subproj/WebHistoryItem.m:
+ * History.subproj/WebHistoryPrivate.h:
+ * History.subproj/WebHistoryPrivate.m:
+ Removed iconURL instance variables, methods, and parameters.
+
+2002-09-04 Darin Adler <darin at apple.com>
+
Did some minor plugin cleanup, mostly to make sure we don't
change pages while a plugin is tracking.
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 7f6c55f..9c2854c 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -35,7 +35,6 @@ extern NSString *WebHistoryEntriesChangedNotification;
- (void)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
- iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString;
// retrieving contents for date-based presentation
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index 07abf99..6d7993e 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -88,13 +88,11 @@ NSString *WebHistoryEntriesChangedNotification = @"WebHistoryEntriesChangedNotif
- (void)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
- iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString
{
if ([_historyPrivate updateURL:newURLString
title:newTitle
displayTitle:newDisplayTitle
- iconURL:iconURL
forURL:oldURLString] != nil) {
// Consider passing changed entry as parameter to notification
[self sendEntriesChangedNotification];
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 0024af7..12a2f8a 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -8,7 +8,6 @@
@interface WebHistoryItem : NSObject
{
NSURL *_URL;
- NSURL *_iconURL;
NSString *_target;
NSString *_parent;
NSString *_title;
@@ -30,7 +29,6 @@
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
- (NSURL *)URL;
-- (NSURL *)iconURL;
- (NSString *)target;
- (NSString *)parent;
- (NSString *)title;
@@ -39,7 +37,6 @@
- (NSCalendarDate *)lastVisitedDate;
- (void)setURL:(NSURL *)URL;
-- (void)setIconURL:(NSURL *)iconURL;
- (void)setTarget:(NSString *)target;
- (void)setParent:(NSString *)parent;
- (void)setTitle:(NSString *)title;
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 98f96cb..8182f5b 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -68,7 +68,6 @@
[_title release];
[_displayTitle release];
[_icon release];
- [_iconURL release];
[_lastVisitedDate release];
[super dealloc];
@@ -79,11 +78,6 @@
return _URL;
}
-- (NSURL *)iconURL
-{
- return _iconURL;
-}
-
-(NSString *)target
{
return _target;
@@ -134,20 +128,11 @@
[self _retainIconInDatabase:NO];
[_URL release];
_URL = [URL retain];
- [self _retainIconInDatabase:YES];
- }
-}
-
-- (void)setIconURL:(NSURL *)iconURL
-{
- if (iconURL != _iconURL) {
- [_iconURL release];
- _iconURL = [iconURL retain];
_loadedIcon = NO;
+ [self _retainIconInDatabase:YES];
}
}
-
-(void)setTitle:(NSString *)title
{
if (title != _title) {
@@ -252,30 +237,20 @@
[dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
forKey: @"lastVisitedDate"];
}
- if (_iconURL != nil) {
- [dict setObject: [_iconURL absoluteString] forKey: @"iconURL"];
- }
return dict;
}
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict
{
- NSString *storedURLString, *iconURLString;
-
[super init];
- storedURLString = [dict objectForKey: @""];
+ NSString *storedURLString = [dict objectForKey: @""];
if (storedURLString != nil) {
_URL = [[NSURL _web_URLWithString:storedURLString] retain];
[self _retainIconInDatabase:YES];
}
- iconURLString = [dict objectForKey:@"iconURL"];
- if(iconURLString){
- _iconURL = [[NSURL _web_URLWithString:iconURLString] retain];
- }
-
_title = [[dict objectForKey: @"title"] copy];
_displayTitle = [[dict objectForKey: @"displayTitle"] copy];
_lastVisitedDate = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
diff --git a/WebKit/History.subproj/WebHistoryPrivate.h b/WebKit/History.subproj/WebHistoryPrivate.h
index 5927fa0..09bc834 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.h
+++ b/WebKit/History.subproj/WebHistoryPrivate.h
@@ -28,7 +28,6 @@
- (WebHistoryItem *)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
- iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString;
- (NSArray *)orderedLastVisitedDays;
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index cd34699..d1ba34f 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -225,7 +225,6 @@
- (WebHistoryItem *)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
- iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString
{
WebHistoryItem *entry;
@@ -249,10 +248,6 @@
[entry setDisplayTitle:newDisplayTitle];
}
- if(iconURL != nil){
- [entry setIconURL:iconURL];
- }
-
return entry;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list