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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 8021b6785548e2c7104ce28b7cfb3739e0232365
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 17 16:10:18 2003 +0000

            Reviewed by John.
    
            * WebView.subproj/WebDataProtocol.m: (+[NSURLRequest _webDataRequestURLForData:]):
            Register the WebDataProtocol here instead of doing it with a load method, since this
            is the bottleneck that must be used before that protocol is needed. It's good to have
            one less load method, and this may fix a problem reported by a Panther WebKit client
            on intrigue-dev too.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5771b89..6fd72ac 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        * WebView.subproj/WebDataProtocol.m: (+[NSURLRequest _webDataRequestURLForData:]):
+        Register the WebDataProtocol here instead of doing it with a load method, since this
+        is the bottleneck that must be used before that protocol is needed. It's good to have
+        one less load method, and this may fix a problem reported by a Panther WebKit client
+        on intrigue-dev too.
+
 2003-04-16  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index 70d6460..0638adb 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -44,6 +44,13 @@ NSString *WebDataProtocolScheme = @"applewebdata";
 
 + (NSURL *)_webDataRequestURLForData: (NSData *)data
 {
+    static BOOL registered;
+    
+    if (!registered) {
+        [NSURLProtocol registerClass:[WebDataProtocol class]];
+        registered = YES;
+    }
+
     static unsigned int counter = 1;
     
     // The URL we generate is meaningless.  The only interesting properties of the URL
@@ -126,11 +133,6 @@ NSString *WebDataProtocolScheme = @"applewebdata";
 // that will handle our custom protocol.
 @implementation WebDataProtocol
 
-+ (void)load
-{
-    [NSURLProtocol registerClass: [self class]];
-}
-
 + (BOOL)canHandleURL:(NSURL *)theURL
 {
     return ([[theURL scheme] caseInsensitiveCompare: WebDataProtocolScheme] == NSOrderedSame);

-- 
WebKit Debian packaging