WebKit:

        Reviewed by John.

 	<rdar://problem/3710101> _web_userVisibleString makes URL autocomplete roughly 2x slower

 	* Misc.subproj/WebNSURLExtras.h:
        * Misc.subproj/WebNSURLExtras.m:
        (-[NSString _web_isUserVisibleURL]): New SPI to check if a URL
 	string is already in user-visible form (i.e. converting it to an
 	NSURL and then back via _web_userVisibleString would not change
 	anything).

WebBrowser:

        Reviewed by John,

	<rdar://problem/3710101> _web_userVisibleString makes URL autocomplete roughly 2x slower

        * URLCompletionController.m:
        (_rawStringFromItem): use URLString from history item when possible, only convert
 	to user visible string when we really have to.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b79e53c80c2b484897a9b60436093936f094db51..af0e3fbfeddf310e377e240aff3b3315a1d7ab9d 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,19 @@
+2004-11-20  Maciej Stachowiak  <mjs@apple.com>
+ 
+        Reviewed by John.
+ 
+       <rdar://problem/3710101> _web_userVisibleString makes URL autocomplete roughly 2x slower
+         
+       * Misc.subproj/WebNSURLExtras.h:
+        * Misc.subproj/WebNSURLExtras.m:
+        (-[NSString _web_isUserVisibleURL]): New SPI to check if a URL
+       string is already in user-visible form (i.e. converting it to an
+       NSURL and then back via _web_userVisibleString would not change
+       anything).
+ 
 2004-11-19  Maciej Stachowiak  <mjs@apple.com>
 
-        Reviewed by NOBODY (OOPS!).
+        Reviewed by John.
 
        <rdar://problem/3190977> closing window with many tabs in it can be quite slow
         

diff --git a/WebKit/Misc.subproj/WebNSURLExtras.h b/WebKit/Misc.subproj/WebNSURLExtras.h
index acfea1c2582ef036172ddd251976be74d59a228b..3eadbb2fbce7004af1cc0274f55bfe45979f6543 100644 (file)
--- a/WebKit/Misc.subproj/WebNSURLExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLExtras.h
@@ -45,6 +45,8 @@
 
 @interface NSString (WebNSURLExtras)
 
+- (BOOL)_web_isUserVisibleURL;
+
 - (BOOL)_web_hostNameNeedsDecodingWithRange:(NSRange)range; // returns NO if decodeHostNameWithRange: would return nil, but more efficient
 - (BOOL)_web_hostNameNeedsEncodingWithRange:(NSRange)range; // returns NO if encodeHostNameWithRange: would return nil, but more efficient
 

diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index b04bece339ed3003b739d327f923ef999d56fa31..8d31e485a7bdf5252588590945e3f27dc2600aee 100644 (file)
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -693,6 +693,51 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
 
 @implementation NSString (WebNSURLExtras)
 
+- (BOOL)_web_isUserVisibleURL
+{
+    BOOL valid = YES;
+    // get buffer
+
+    char static_buffer[1024];
+    const char *p;
+    BOOL success = CFStringGetCString((CFStringRef)self, static_buffer, 1023, kCFStringEncodingUTF8);
+    if (success) {
+        p = static_buffer;
+    } else {
+        p = [self UTF8String];
+    }
+
+    int length = strlen(p);
+
+    // check for characters <= 0x20 or >=0x7f, %-escape sequences of %7f, and xn--, these
+    // are the things that will lead _web_userVisisbleString to actually change things.
+    int i;
+    for (i = 0; i < length; i++) {
+        unsigned char c = p[i];
+        // escape control characters, space, and delete
+        if (c <= 0x20 || c == 0x7f) {
+            valid = NO;
+            break;
+        } else if (c == '%' && (i + 1 < length && isHexDigit(p[i + 1])) && i + 2 < length && isHexDigit(p[i + 2])) {
+            unsigned char u = (hexDigitValue(p[i + 1]) << 4) | hexDigitValue(p[i + 2]);
+            if (u > 0x7f) {
+                valid = NO;
+                break;
+            }
+            i += 2;
+        } else {
+            // Check for "xn--" in an efficient, non-case-sensitive, way.
+            if (c == '-' && i >= 3 && (p[-3] | 0x20) == 'x' && (p[-2] | 0x20) == 'n' && p[-1] == '-') {
+                valid = NO;
+                break;
+            }
+        }
+    }
+
+    return valid;
+}
+
+
 - (BOOL)_webkit_isJavaScriptURL
 {
     return [self _web_hasCaseInsensitivePrefix:@"javascript:"];