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

[trey]

The following commit has been merged in the debian/unstable branch:
commit df98763c673bcde40c9c9feb70016d1d78fc121f
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 24 22:46:55 2004 +0000

    WebKit:
    
    	3672725 - Assertion failure in URLCompletion code with particular set of bookmarks
    
    	Problem was caused by a URL with unescaped unicodes getting into
    	the Bookmarks file, presumably from import from IE.  We now test
    	for this case and convert the data on the way in as if it were
    	user-entered.
    
            Reviewed by John and Darin.
    
            * History.subproj/WebHistoryItem.m:
            (-[WebHistoryItem initFromDictionaryRepresentation:]):
    
    WebBrowser:
    
    	A little extra timing logging added as part of fixing 3672725.
    
            Reviewed by John.
    
            * URLCompletionController.m:
            (+[URLCompletionController _loadDB]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f0c965e..524729a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,19 @@
 2004-06-24  Trey Matteson  <trey at apple.com>
 
+	3672725 - Assertion failure in URLCompletion code with particular set of bookmarks
+
+	Problem was caused by a URL with unescaped unicodes getting into
+	the Bookmarks file, presumably from import from IE.  We now test
+	for this case and convert the data on the way in as if it were
+	user-entered.
+
+        Reviewed by John and Darin.
+
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+
+2004-06-24  Trey Matteson  <trey at apple.com>
+
 	3704950	drag image in DB ConfigBar has horizontal graphics turd	WebCore JavaScript
 
 	When we generate a drag image (or a selection image too, for that matter) we
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 8f99833..78e48d9 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -585,6 +585,17 @@ NSString *WebHistoryItemChangedNotification = @"WebHistoryItemChangedNotificatio
 
     self = [self initWithURLString:URLString title:title lastVisitedTimeInterval:lastVisited];
 
+    // Check if we've read a broken URL from the file that has non-Latin1 chars.  If so, try to convert
+    // as if it was from user typing.
+    if (![_private->URLString canBeConvertedToEncoding:NSISOLatin1StringEncoding]) {
+        NSURL *tempURL = [NSURL _web_URLWithUserTypedString:_private->URLString];
+        ASSERT(tempURL);
+        [_private->URLString release];
+        _private->URLString = [[tempURL _web_originalDataAsString] copy];
+        [_private->originalURLString release];
+        _private->originalURLString = [_private->URLString retain];
+    }
+
     [self setAlternateTitle:[dict _web_stringForKey:WebDisplayTitleKey]];
 
     _private->visitCount = [dict _web_intForKey:WebVisitCountKey];

-- 
WebKit Debian packaging