[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:12:03 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 59fecba7e3c6db6ed5469cc12d420501ec62b903
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 10 21:25:22 2002 +0000
Fixed 2922756 (@ image in History window is a little too tall)
Fixed 2923790 (bookmark folders need folder icons)
* Resources/bookmark_folder.tiff: New image (small folder, copied from elsewhere)
* Resources/url_icon.tiff: Shrunk this one a little bit.
* Bookmarks.subproj/IFBookmarkList.m:
(-[IFBookmarkList image]): Return the default image if no custom image is set.
* History.subproj/IFURIEntry.m:
(-[IFURIEntry image]): If the default image's file isn't found, don't try
to create an NSImage, because it will come out horribly broken and evil if
you do (I ran into this while adding the bookmark folder image; most of Alexander's
menus did not appear at all because the bookmark folder image was using a bogus
NSImage).
* WebKit.pbproj/project.pbxproj: Updated for new files.
Fixed 2922745 (Bookmark and History window should use same font size)
Fixed 2923792 (All buttons in Bookmarks window look the same)
* Resources/Images/new_bookmark.tiff: Added.
* Resources/Images/new_folder.tiff: Added.
* Resources/Images/pencil.tiff: Added.
New images for buttons in Bookmarks window. new_folder
was stolen from Finder; pencil was stolen from Mail;
new_bookmark is a Sullivan Original™.
* AppController.m:
(-[AppController _addBookmarksToMenu]):
(-[AppController _updateBookmarksInMenu]):
Remove count of bookmarks from debug timing message since
it wasn't counting deep.
* BookmarksController.m:
(-[BookmarksController toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:]):
Use the right images for the right buttons.
* English.lproj/Bookmarks.nib: Change the font size to
match History window.
* WebBrowser.pbproj/project.pbxproj: Updated for new files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1130 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkList.m b/WebKit/Bookmarks.subproj/IFBookmarkList.m
index dba42f8..9cb5718 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkList.m
@@ -134,7 +134,25 @@
- (NSImage *)image
{
- return _image;
+ static NSImage *defaultImage = nil;
+ static BOOL loadedDefaultImage = NO;
+
+ if (_image != nil) {
+ return _image;
+ }
+
+ // Attempt to load default image only once, to avoid performance penalty of repeatedly
+ // trying and failing to find it.
+ if (!loadedDefaultImage) {
+ NSString *pathForDefaultImage =
+ [[NSBundle bundleForClass:[self class]] pathForResource:@"bookmark_folder" ofType:@"tiff"];
+ if (pathForDefaultImage != nil) {
+ defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
+ }
+ loadedDefaultImage = YES;
+ }
+
+ return defaultImage;
}
- (void)setImage:(NSImage *)image
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index dba42f8..9cb5718 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -134,7 +134,25 @@
- (NSImage *)image
{
- return _image;
+ static NSImage *defaultImage = nil;
+ static BOOL loadedDefaultImage = NO;
+
+ if (_image != nil) {
+ return _image;
+ }
+
+ // Attempt to load default image only once, to avoid performance penalty of repeatedly
+ // trying and failing to find it.
+ if (!loadedDefaultImage) {
+ NSString *pathForDefaultImage =
+ [[NSBundle bundleForClass:[self class]] pathForResource:@"bookmark_folder" ofType:@"tiff"];
+ if (pathForDefaultImage != nil) {
+ defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
+ }
+ loadedDefaultImage = YES;
+ }
+
+ return defaultImage;
}
- (void)setImage:(NSImage *)image
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d5eb6f9..782e105 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-05-10 John Sullivan <sullivan at apple.com>
+
+ Fixed 2922756 (@ image in History window is a little too tall)
+ Fixed 2923790 (bookmark folders need folder icons)
+
+ * Resources/bookmark_folder.tiff: New image (small folder, copied from elsewhere)
+ * Resources/url_icon.tiff: Shrunk this one a little bit.
+
+ * Bookmarks.subproj/IFBookmarkList.m:
+ (-[IFBookmarkList image]): Return the default image if no custom image is set.
+
+ * History.subproj/IFURIEntry.m:
+ (-[IFURIEntry image]): If the default image's file isn't found, don't try
+ to create an NSImage, because it will come out horribly broken and evil if
+ you do (I ran into this while adding the bookmark folder image; most of Alexander's
+ menus did not appear at all because the bookmark folder image was using a bogus
+ NSImage).
+
+ * WebKit.pbproj/project.pbxproj: Updated for new files.
+
2002-05-10 Kenneth Kocienda <kocienda at apple.com>
Reviewed by: Maciej Stachowiak
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d5eb6f9..782e105 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-05-10 John Sullivan <sullivan at apple.com>
+
+ Fixed 2922756 (@ image in History window is a little too tall)
+ Fixed 2923790 (bookmark folders need folder icons)
+
+ * Resources/bookmark_folder.tiff: New image (small folder, copied from elsewhere)
+ * Resources/url_icon.tiff: Shrunk this one a little bit.
+
+ * Bookmarks.subproj/IFBookmarkList.m:
+ (-[IFBookmarkList image]): Return the default image if no custom image is set.
+
+ * History.subproj/IFURIEntry.m:
+ (-[IFURIEntry image]): If the default image's file isn't found, don't try
+ to create an NSImage, because it will come out horribly broken and evil if
+ you do (I ran into this while adding the bookmark folder image; most of Alexander's
+ menus did not appear at all because the bookmark folder image was using a bogus
+ NSImage).
+
+ * WebKit.pbproj/project.pbxproj: Updated for new files.
+
2002-05-10 Kenneth Kocienda <kocienda at apple.com>
Reviewed by: Maciej Stachowiak
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
index 4c48e7c..5772e6b 100644
--- a/WebKit/History.subproj/IFURIEntry.m
+++ b/WebKit/History.subproj/IFURIEntry.m
@@ -86,7 +86,9 @@
if (!loadedDefaultImage) {
NSString *pathForDefaultImage =
[[NSBundle bundleForClass:[self class]] pathForResource:@"url_icon" ofType:@"tiff"];
- defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
+ if (pathForDefaultImage != nil) {
+ defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
+ }
loadedDefaultImage = YES;
}
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 4c48e7c..5772e6b 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -86,7 +86,9 @@
if (!loadedDefaultImage) {
NSString *pathForDefaultImage =
[[NSBundle bundleForClass:[self class]] pathForResource:@"url_icon" ofType:@"tiff"];
- defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
+ if (pathForDefaultImage != nil) {
+ defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
+ }
loadedDefaultImage = YES;
}
diff --git a/WebKit/Resources/bookmark_folder.tiff b/WebKit/Resources/bookmark_folder.tiff
new file mode 100644
index 0000000..ce9e80c
Binary files /dev/null and b/WebKit/Resources/bookmark_folder.tiff differ
diff --git a/WebKit/Resources/url_icon.tiff b/WebKit/Resources/url_icon.tiff
index 4499b5c..c5e9a9d 100644
Binary files a/WebKit/Resources/url_icon.tiff and b/WebKit/Resources/url_icon.tiff differ
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 3b7a381..80c73a0 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -248,6 +248,7 @@
F5883BDF025E5C6A01000102,
F5E638640265FC0D01000102,
F5E638650265FC0D01000102,
+ F599A818028C6D0D0124FDD6,
);
isa = PBXResourcesBuildPhase;
};
@@ -315,6 +316,7 @@
35F3577E0198AAB80ACA1520,
089C1666FE841158C02AAC07,
35F3577401986B740ACA1520,
+ F599A817028C6D0D0124FDD6,
F5B67130023EDF8901C1A525,
F5883BDE025E5C6A01000102,
25B2A7C4025D0A880ECA149E,
@@ -1350,6 +1352,18 @@
isa = PBXBuildStyle;
name = Unoptimized;
};
+ F599A817028C6D0D0124FDD6 = {
+ isa = PBXFileReference;
+ name = bookmark_folder.tiff;
+ path = Resources/bookmark_folder.tiff;
+ refType = 4;
+ };
+ F599A818028C6D0D0124FDD6 = {
+ fileRef = F599A817028C6D0D0124FDD6;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F59EAE3E0253C7EE018635CA = {
isa = PBXFileReference;
name = IFCache.h;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list