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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f0167229d329f26df8286060a31a87e5034e7d04
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 16 23:23:11 2002 +0000

            Remove fix (according to John, partial fix) for 3051288.
            Canonicalizing the URL strings used in the history db
            is very slow!  ~8% slower.
    
            * History.subproj/WebHistoryPrivate.m:
            (-[WebHistoryPrivate addEntry:]):
            (-[WebHistoryPrivate removeEntry:]):
            (-[WebHistoryPrivate containsURL:]):
            (-[WebHistoryPrivate entryForURL:]):
    
            * WebView.subproj/WebHTMLView.h:
            Removed cruft from header.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2073 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 51ce72e..cb41c52 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-09-16  Richard Williamson   <rjw at apple.com>
+
+        Remove fix (according to John, partial fix) for 3051288.
+        Canonicalizing the URL strings used in the history db
+        is very slow!  ~8% slower.
+        
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate addEntry:]):
+        (-[WebHistoryPrivate removeEntry:]):
+        (-[WebHistoryPrivate containsURL:]):
+        (-[WebHistoryPrivate entryForURL:]):
+        
+        * WebView.subproj/WebHTMLView.h:
+        Removed cruft from header.
+
 2002-09-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3050810 -- while an image is loading progressively, it draws
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 51ce72e..cb41c52 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-09-16  Richard Williamson   <rjw at apple.com>
+
+        Remove fix (according to John, partial fix) for 3051288.
+        Canonicalizing the URL strings used in the history db
+        is very slow!  ~8% slower.
+        
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate addEntry:]):
+        (-[WebHistoryPrivate removeEntry:]):
+        (-[WebHistoryPrivate containsURL:]):
+        (-[WebHistoryPrivate entryForURL:]):
+        
+        * WebView.subproj/WebHTMLView.h:
+        Removed cruft from header.
+
 2002-09-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3050810 -- while an image is loading progressively, it draws
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index a0f1d6d..adcf639 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -20,6 +20,8 @@
 
 @implementation WebHistoryPrivate
 
+#define FIX_VISITED
+
 #pragma mark OBJECT FRAMEWORK
 
 + (void)initialize
@@ -143,7 +145,11 @@
 
     ASSERT_ARG(entry, [entry lastVisitedDate] != nil);
 
+#ifdef FIX_VISITED
     URLString = [[[entry URL] _web_canonicalize] absoluteString];
+#else
+    URLString = [[entry URL] absoluteString];
+#endif
     [self removeEntryForURLString: URLString];
 
     if ([self findIndex: &dateIndex forDay: [entry lastVisitedDate]]) {
@@ -163,7 +169,11 @@
     WebHistoryItem *matchingEntry;
     NSString *URLString;
 
+#ifdef FIX_VISITED
     URLString = [[[entry URL] _web_canonicalize] absoluteString];
+#else
+    URLString = [[entry URL] absoluteString];
+#endif
 
     // If this exact object isn't stored, then make no change.
     // FIXME: Is this the right behavior if this entry isn't present, but another entry for the same URL is?
@@ -293,12 +303,20 @@
 
 - (BOOL)containsURL: (NSURL *)URL
 {
+#ifdef FIX_VISITED
     return [self _entryForURLString:[[URL _web_canonicalize] absoluteString]] != nil;
+#else
+    return [self _entryForURLString:[URL absoluteString]] != nil;
+#endif
 }
 
 - (WebHistoryItem *)entryForURL:(NSURL *)URL
 {
+#ifdef FIX_VISITED
     return [self _entryForURLString:[[URL _web_canonicalize] absoluteString]];
+#else
+    return [self _entryForURLString:[URL absoluteString]];
+#endif
 }	
 
 #pragma mark ARCHIVING/UNARCHIVING
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 06cd0fa..4b7103b 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
-			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index 3ae6a04..58ca2cb 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -34,11 +34,6 @@
 // instead call setNeedsToApplyStyles:.
 - (void)reapplyStyles;
 
-// Returns an array of built-in context menu items for this node.
-// Generally called by WebContextMenuHandlers from contextMenuItemsForNode:
-#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WebDOMNode *);
-#endif
 - (void)setContextMenusEnabled: (BOOL)flag;
 - (BOOL)contextMenusEnabled;
 
@@ -50,19 +45,3 @@
 
 @end
 
-/*
-    Areas still to consider:
-
-        ALT image text and link URLs
-            Should this be built-in?  or able to be overriden?
-            
-        node events
-		
-	client access to form elements for auto-completion, passwords
-        
-        selection
-            Selection on data source is reflected in view.
-            Does the view also need a cover selection API?
-            
-        subclassing of WebView
-*/

-- 
WebKit Debian packaging