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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 193cce26fac24bf5c555118ff1dbb50c8dbe4cd2
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 10 18:47:50 2002 +0000

    WebKit:
    
            * History.subproj/WebHistory.h:
            * History.subproj/WebHistory.m:
            (-[WebHistory entryForURL:]): added
            * History.subproj/WebHistoryPrivate.h:
            * History.subproj/WebHistoryPrivate.m:
            (-[WebHistoryPrivate entryForURL:]): added
            * Misc.subproj/WebIconDatabase.h: added WebIconLargeSize
            * Misc.subproj/WebIconDatabase.m: added WebIconLargeSize
            * WebKit.exp: export link label key and WebIconLargeSize
    
    WebBrowser:
    
    	Check history and the link's label when suggesting a bookmark title.
    
            * ContextMenuHandler.m:
            (-[ContextMenuHandler addLinkToBookmarks:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2020 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b7ef837..e21a28c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-10  Chris Blumenberg  <cblu at apple.com>
+
+        * History.subproj/WebHistory.h:
+        * History.subproj/WebHistory.m:
+        (-[WebHistory entryForURL:]): added
+        * History.subproj/WebHistoryPrivate.h:
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate entryForURL:]): added
+        * Misc.subproj/WebIconDatabase.h: added WebIconLargeSize
+        * Misc.subproj/WebIconDatabase.m: added WebIconLargeSize
+        * WebKit.exp: export link label key and WebIconLargeSize
+
 2002-09-10  Darin Adler  <darin at apple.com>
 
 	WebKit part of weaning WebCore from getting directly at WebKit defaults.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b7ef837..e21a28c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-09-10  Chris Blumenberg  <cblu at apple.com>
+
+        * History.subproj/WebHistory.h:
+        * History.subproj/WebHistory.m:
+        (-[WebHistory entryForURL:]): added
+        * History.subproj/WebHistoryPrivate.h:
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate entryForURL:]): added
+        * Misc.subproj/WebIconDatabase.h: added WebIconLargeSize
+        * Misc.subproj/WebIconDatabase.m: added WebIconLargeSize
+        * WebKit.exp: export link label key and WebIconLargeSize
+
 2002-09-10  Darin Adler  <darin at apple.com>
 
 	WebKit part of weaning WebCore from getting directly at WebKit defaults.
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 9c2854c..e34c68f 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -56,6 +56,9 @@ extern NSString *WebHistoryEntriesChangedNotification;
 // testing contents for visited-link mechanism
 - (BOOL)containsURL: (NSURL *)URL;
 
+// retreiving information for a specific URL
+- (WebHistoryItem *)entryForURL:(NSURL *)URL;
+
 // storing contents on disk
 
 // The file path used for storing history, specified in -[WebHistory initWithFile:] or +[WebHistory webHistoryWithFile:]
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index a99ad9f..9b0b708 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -131,6 +131,11 @@ NSString *WebHistoryEntriesChangedNotification = @"WebHistoryEntriesChangedNotif
     return [_historyPrivate containsURL: URL];
 }
 
+- (WebHistoryItem *)entryForURL:(NSURL *)URL
+{
+    return [_historyPrivate entryForURL:URL];
+}
+
 #pragma mark SAVING TO DISK
 
 - (NSString *)file
diff --git a/WebKit/History.subproj/WebHistoryPrivate.h b/WebKit/History.subproj/WebHistoryPrivate.h
index 09bc834..2a546d0 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.h
+++ b/WebKit/History.subproj/WebHistoryPrivate.h
@@ -35,6 +35,7 @@
 - (NSArray *)entriesWithAddressContainingString: (NSString *)string;
 - (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string;
 - (BOOL)containsURL: (NSURL *)URL;
+- (WebHistoryItem *)entryForURL:(NSURL *)URL;
 
 - (NSString *)file;
 - (BOOL)loadHistory;
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index e3b2e83..91b8b5d 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -296,6 +296,11 @@
     return [self _entryForURLString:[URL absoluteString]] != nil;
 }
 
+- (WebHistoryItem *)entryForURL:(NSURL *)URL
+{
+    return [self _entryForURLString:[URL absoluteString]];
+}	
+
 #pragma mark ARCHIVING/UNARCHIVING
 
 // Return a date that marks the age limit for history entries saved to or
diff --git a/WebKit/Misc.subproj/WebIconDatabase.h b/WebKit/Misc.subproj/WebIconDatabase.h
index c40572f..0f7050d 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.h
+++ b/WebKit/Misc.subproj/WebIconDatabase.h
@@ -32,6 +32,7 @@ extern NSString *WebIconNotificationUserInfoSiteURLKey;
 
 extern NSSize WebIconSmallSize;  // 16 x 16
 extern NSSize WebIconMediumSize; // 32 x 32
+extern NSSize WebIconLargeSize;  // 128 x 128
 
 @class WebIconDatabasePrivate;
 
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 683fcc5..1e7c8a0 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -26,6 +26,7 @@ NSString *WebIconNotificationUserInfoSiteURLKey = @"WebIconNotificationUserInfoS
 
 NSSize WebIconSmallSize = {16, 16};
 NSSize WebIconMediumSize = {32, 32};
+NSSize WebIconLargeSize = {128, 128};
 
 
 @interface WebIconDatabase (WebInternal)
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 800e52e..6114042 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -24,6 +24,7 @@
 .objc_class_name_WebTestController
 .objc_class_name_WebURLsWithTitles
 .objc_class_name_WebView
+_WebContextMenuElementLinkLabelKey
 _WebContextMenuElementLinkURLKey
 _WebContextMenuElementImageURLKey
 _WebContextMenuElementStringKey
@@ -33,6 +34,7 @@ _WebHistoryEntriesChangedNotification
 _WebIconDidChangeNotification
 _WebIconSmallSize
 _WebIconMediumSize
+_WebIconLargeSize
 _WebIconNotificationUserInfoSiteURLKey
 
 

-- 
WebKit Debian packaging