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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:36:17 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit f1f549f903aac5546fede490b959fc47d2a2b5b5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 10 19:23:01 2003 +0000

            Reviewed by Darin.
    
    	Another launch time speedup - don't load the WebKit WebError
    	strings until we actually make a WebKit error. This prevents the
    	WebKit localized strings file from being loaded during normal startup.
    
            * Downloads.subproj/WebDownload.m:
            (+[WebDownloadPrivate initialize]): Don't register WebKit errors.
            (-[WebDownload _errorWithCode:]): Use _webKitErrorWithCode:failingURL:
            * Misc.subproj/WebKitErrors.m:
            (+[WebError _webKitErrorWithCode:failingURL:]): Wrapper that registers the
    	WebKit error codes first.
            * Misc.subproj/WebKitErrorsPrivate.h:
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _handleUnimplementablePolicyWithErrorCode:forURL:]):  Use
    	_webKitErrorWithCode:failingURL:
            (-[WebFrame _loadItem:withLoadType:]):  Use _webKitErrorWithCode:failingURL:
            * WebView.subproj/WebFrameView.m:
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient interruptForPolicyChangeError]):  Use _webKitErrorWithCode:failingURL:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1ab93be..c622429 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2003-04-10  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	Another launch time speedup - don't load the WebKit WebError
+	strings until we actually make a WebKit error. This prevents the
+	WebKit localized strings file from being loaded during normal startup.
+
+        * Downloads.subproj/WebDownload.m:
+        (+[WebDownloadPrivate initialize]): Don't register WebKit errors.
+        (-[WebDownload _errorWithCode:]): Use _webKitErrorWithCode:failingURL:
+        * Misc.subproj/WebKitErrors.m:
+        (+[WebError _webKitErrorWithCode:failingURL:]): Wrapper that registers the
+	WebKit error codes first.
+        * Misc.subproj/WebKitErrorsPrivate.h:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _handleUnimplementablePolicyWithErrorCode:forURL:]):  Use 
+	_webKitErrorWithCode:failingURL:
+        (-[WebFrame _loadItem:withLoadType:]):  Use _webKitErrorWithCode:failingURL:
+        * WebView.subproj/WebFrameView.m:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient interruptForPolicyChangeError]):  Use _webKitErrorWithCode:failingURL:
+
 2003-04-10  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3222896 - REGRESSION: sound plays after closing a window with a RealPlayer plug-in in it
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 331811b..c87da17 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -125,8 +125,6 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
 
 + (void)initialize
 {
-    [WebError _registerWebKitErrors];
-    
     decoderClasses = [[NSArray arrayWithObjects:
         [WebBinHexDecoder class],
         [WebMacBinaryDecoder class],
@@ -886,9 +884,8 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
 
 - (WebError *)_errorWithCode:(int)code
 {
-    return [WebError errorWithCode:code
-                          inDomain:WebErrorDomainWebKit
-                        failingURL:[[_private->request URL] absoluteString]];
+    return [WebError _webKitErrorWithCode:code
+                               failingURL:[[_private->request URL] absoluteString]];
 }
 
 - (SInt16)_dataForkReferenceNumber
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index b5745cf..b516610 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -48,6 +48,14 @@ static void registerErrors(void);
     pthread_once(&registerErrorsControl, registerErrors);
 }
 
++ (WebError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL
+{
+    [self _registerWebKitErrors];
+
+    return [self errorWithCode:code inDomain:WebErrorDomainWebKit failingURL:URL];
+}
+
+
 @end
 
 static void registerErrors()
@@ -82,4 +90,4 @@ static void registerErrors()
     [WebError addErrorsWithCodesAndDescriptions:dict inDomain:WebErrorDomainWebKit];
 
     [pool release];
-}
\ No newline at end of file
+}
diff --git a/WebKit/Misc.subproj/WebKitErrorsPrivate.h b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
index 1459b85..be25c31 100644
--- a/WebKit/Misc.subproj/WebKitErrorsPrivate.h
+++ b/WebKit/Misc.subproj/WebKitErrorsPrivate.h
@@ -10,6 +10,6 @@
 #import <WebFoundation/WebError.h>
 
 @interface WebError (WebExtras)
-+ (void)_registerWebKitErrors;
++ (WebError *)_webKitErrorWithCode:(int)code failingURL:(NSString *)URL;
 @end
 
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 3d4fe17..6a1d5a3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -23,6 +23,7 @@
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPolicyDelegatePrivate.h>
 #import <WebKit/WebPreferencesPrivate.h>
@@ -1042,9 +1043,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 
 - (void)_handleUnimplementablePolicyWithErrorCode:(int)code forURL:(NSURL *)URL
 {
-    WebError *error = [WebError errorWithCode:code
-                                     inDomain:WebErrorDomainWebKit
-                                   failingURL:[URL absoluteString]];
+    WebError *error = [WebError _webKitErrorWithCode:code
+				          failingURL:[URL absoluteString]];
     WebView *c = [self webView];
     [[c _policyDelegateForwarder] webView:c unableToImplementPolicyWithError:error inFrame:self];    
 }
@@ -1096,6 +1096,9 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     // check for all that as an additional optimization.
     // We also do not do anchor-style navigation if we're posting a form.
     
+    // FIXME: These checks don't match the ones in _loadURL:referrer:loadType:target:triggeringEvent:isFormSubmission:
+    // Perhaps they should.
+    
     if (!formData && ![self _shouldReloadForCurrent:itemURL andDestination:currentURL] )
     {
 #if 0
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index aa3762e..cadc09d 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -36,11 +36,6 @@ enum {
 
 @implementation WebFrameView
 
-+ (void)initialize
-{
-    [WebError _registerWebKitErrors];
-}
-
 - initWithFrame: (NSRect) frame
 {
     [super initWithFrame: frame];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index ddce419..9f910d3 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -25,6 +25,7 @@
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPolicyDelegatePrivate.h>
@@ -84,9 +85,8 @@
 
 - (WebError *)interruptForPolicyChangeError
 {
-    return [WebError errorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
-                          inDomain:WebErrorDomainWebKit
-                        failingURL:[[request URL] absoluteString]];
+    return [WebError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
+		               failingURL:[[request URL] absoluteString]];
 }
 
 -(void)stopLoadingForPolicyChange
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index ddce419..9f910d3 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -25,6 +25,7 @@
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebKitErrors.h>
+#import <WebKit/WebKitErrorsPrivate.h>
 #import <WebKit/WebKitLogging.h>
 #import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPolicyDelegatePrivate.h>
@@ -84,9 +85,8 @@
 
 - (WebError *)interruptForPolicyChangeError
 {
-    return [WebError errorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
-                          inDomain:WebErrorDomainWebKit
-                        failingURL:[[request URL] absoluteString]];
+    return [WebError _webKitErrorWithCode:WebKitErrorLocationChangeInterruptedByPolicyChange
+		               failingURL:[[request URL] absoluteString]];
 }
 
 -(void)stopLoadingForPolicyChange

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list