[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:32:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ab95955c8a762956b252ee7ad4c7f9a14132493d
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 16 18:15:21 2002 +0000
WebKit:
- fixed 3025394 -- Bookmarks & History items do not remember their icons
across launches
- fixed 3025421 -- Dragging from location field proxy icon to favorites bar
loses page icon
- part of fix for 3026279 -- Bookmarks should lose their favIcons when the
URL is edited
* Bookmarks.subproj/WebBookmarkLeaf.m:
(-[WebBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
(-[WebBookmarkLeaf dictionaryRepresentation]):
Removed the #ifdeffed-out code for storing iconURL in dictionary; this was
unnecessary because it is also done by the lower-level WebHistoryItem.
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItem _setIcon:]): New method, extracted from -icon for clarity.
(-[WebHistoryItem icon]): Fixed problem where once an icon was set it would
never be changed, even if the iconURL is changed. Also, use _setIcon for
clarity and to fix retainCount bugs.
(-[WebHistoryItem dictionaryRepresentation]):
Removed the #ifdef around the line that stores the URL in the dictionary.
Gramps decided that this architecture is OK after all.
WebBrowser:
- part of fix for 3026279 -- Bookmarks should lose their favIcons when the
URL is edited
* BookmarksController.m:
(-[BookmarksController _changeAddressForBookmark:to:withIconURL:]):
Added iconURL parameter to this method; use new iconURL and remember
old one in Undo info.
(-[BookmarksController _undoAddressChange:]): Now resets the iconURL
as well as the address.
(-[BookmarksController outlineView:setObjectValue:forTableColumn:byItem:]):
pass nil for new iconURL when address is changed. Also canonicalize URL
if possible to minimize clobbering favIcons with insignificant address
changes; this has the nice side benefit of instantly displaying the
URL-ized form of the user-entered text in the Bookmarks window, a feature
that Maciej has long thought would be useful.
* OutlineViewPlus.m:
(-[OutlineViewPlus textDidEndEditing:]): Revert change I made yesterday
that broke the tabbing case; added comment.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index 7792762..4248acc 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -17,7 +17,6 @@
#define URIDictionaryKey @"URIDictionary"
#define URLStringKey @"URLString"
-#define IconURLStringKey @"IconURLString"
@implementation WebBookmarkLeaf
@@ -60,10 +59,6 @@
[dict objectForKey:URIDictionaryKey]] retain];
_URLString = [[dict objectForKey:URLStringKey] retain];
- NSString *iconURLString = [dict objectForKey:IconURLStringKey];
- if(iconURLString){
- [_entry setIconURL:[NSURL _web_URLWithString:iconURLString]];
- }
return self;
}
@@ -78,14 +73,6 @@
if (_URLString != nil) {
[dict setObject:_URLString forKey:URLStringKey];
}
-
-#if 0
-// FIXME 8/15/2002 -- temporarily removing support for storing iconURL (favIcon), due to architecture issues
- NSURL *iconURL = [_entry iconURL];
- if(iconURL) {
- [dict setObject:[iconURL absoluteString] forKey:IconURLStringKey];
- }
-#endif
return dict;
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a4d0164..3da8bec 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,27 @@
+2002-08-16 John Sullivan <sullivan at apple.com>
+
+ - fixed 3025394 -- Bookmarks & History items do not remember their icons
+ across launches
+ - fixed 3025421 -- Dragging from location field proxy icon to favorites bar
+ loses page icon
+ - part of fix for 3026279 -- Bookmarks should lose their favIcons when the
+ URL is edited
+
+ * Bookmarks.subproj/WebBookmarkLeaf.m:
+ (-[WebBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
+ (-[WebBookmarkLeaf dictionaryRepresentation]):
+ Removed the #ifdeffed-out code for storing iconURL in dictionary; this was
+ unnecessary because it is also done by the lower-level WebHistoryItem.
+
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem _setIcon:]): New method, extracted from -icon for clarity.
+ (-[WebHistoryItem icon]): Fixed problem where once an icon was set it would
+ never be changed, even if the iconURL is changed. Also, use _setIcon for
+ clarity and to fix retainCount bugs.
+ (-[WebHistoryItem dictionaryRepresentation]):
+ Removed the #ifdef around the line that stores the URL in the dictionary.
+ Gramps decided that this architecture is OK after all.
+
2002-08-16 Darin Adler <darin at apple.com>
Fixed broken build.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a4d0164..3da8bec 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,27 @@
+2002-08-16 John Sullivan <sullivan at apple.com>
+
+ - fixed 3025394 -- Bookmarks & History items do not remember their icons
+ across launches
+ - fixed 3025421 -- Dragging from location field proxy icon to favorites bar
+ loses page icon
+ - part of fix for 3026279 -- Bookmarks should lose their favIcons when the
+ URL is edited
+
+ * Bookmarks.subproj/WebBookmarkLeaf.m:
+ (-[WebBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
+ (-[WebBookmarkLeaf dictionaryRepresentation]):
+ Removed the #ifdeffed-out code for storing iconURL in dictionary; this was
+ unnecessary because it is also done by the lower-level WebHistoryItem.
+
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItem _setIcon:]): New method, extracted from -icon for clarity.
+ (-[WebHistoryItem icon]): Fixed problem where once an icon was set it would
+ never be changed, even if the iconURL is changed. Also, use _setIcon for
+ clarity and to fix retainCount bugs.
+ (-[WebHistoryItem dictionaryRepresentation]):
+ Removed the #ifdef around the line that stores the URL in the dictionary.
+ Gramps decided that this architecture is OK after all.
+
2002-08-16 Darin Adler <darin at apple.com>
Fixed broken build.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 0236abc..5e7b6b3 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -86,15 +86,26 @@
return _displayTitle;
}
+-(void)_setIcon:(NSImage *)newIcon
+{
+ [newIcon retain];
+ [_icon release];
+ _icon = newIcon;
+}
+
-(NSImage *)icon
{
- if(!_icon && !_loadedIcon){
- if(_iconURL){
- _icon = [[WebIconLoader iconLoaderWithURL:_iconURL] iconFromCache];
- }else if([_URL isFileURL]){
- _icon = [WebIconLoader iconForFileAtPath:[_URL path]];
+ if (!_loadedIcon) {
+ NSImage *newIcon;
+
+ if (_iconURL != nil) {
+ newIcon = [[WebIconLoader iconLoaderWithURL:_iconURL] iconFromCache];
+ } else if ([_URL isFileURL]) {
+ newIcon = [WebIconLoader iconForFileAtPath:[_URL path]];
+ } else {
+ newIcon = nil;
}
- [_icon retain];
+ [self _setIcon:newIcon];
_loadedIcon = YES;
}
@@ -229,12 +240,9 @@
[dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
forKey: @"lastVisitedDate"];
}
-#if 0
-// FIXME 8/15/2002 -- temporarily removing support for storing iconURL (favIcon), due to architecture issues
if (_iconURL != nil) {
[dict setObject: [_iconURL absoluteString] forKey: @"iconURL"];
}
-#endif
return dict;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list