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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:42:28 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit fe2332bddec6898d7d5be268747d52329e5a7ab8
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 23 14:58:18 2002 +0000

    WebFoundation:
    
            Modified code to work with new WebError API. Many changes in that API, including removing terminal errors,
    	taking a pass at the error constants, and cleaning up the init methods.
    
            * AuthenticationManager.subproj/WebAuthenticationManager.m:
            (-[WebAuthenticationManager _checkForAuthenticationFailureInHTTPResponse:withURL:result:]): WebFoundation error code constant name changes
            * AuthenticationManager.subproj/WebAuthenticationManagerPrivate.h: Removed WebResult enumerated type; replace with int
            * CacheLoader.subproj/IFURLHandleC.h: WebError API change
            * CacheLoader.subproj/IFURLHandleC.m: Ditto
            (IFURLHandleBackgroundLoadFailedWithResultCode):
            * CacheLoader.subproj/WebCacheLoaderConstants.h: Removed error constants; moved to WebError.h
            * CacheLoader.subproj/WebResourceHandle.m:
            (-[WebResourceHandle cancelLoadInBackground]): WebFoundation error code constant name changes
            * CacheLoader.subproj/WebResourceLoad.h: WebError API change
            * CacheLoader.subproj/WebResourceLoad.m:
            (-[WebResourceLoad failedWithResultCode:inDomain:failingURL:]): WebError API change
            (-[WebResourceLoad didRedirectToURL:permanent:]): Ditto.
            (-[WebResourceLoad _scheduleOriginLoad]): Ditto.
            (-[WebResourceLoad _beginOriginLoad]): Ditto.
            (_loadSweeper): Ditto.
            * CacheLoader.subproj/WebResourceResponse.m:
            (-[WebResourceResponse init]): WebFoundation error code constant name changes
            * English.lproj/WebError.strings: Updated strings file. This file was way out of date.
            * Misc.subproj/WebError.h: Updated API. Terminal error concept removed. API simplified. Error constants moved into this file.
            * Misc.subproj/WebError.m:
            (classInitialize): Changes to adapt to new API.
            (-[WebError initWithErrorCode:inDomain:failingURL:]): Ditto
            (-[WebError errorDescription]): Ditto
            (+[WebError addErrorsWithCodesAndDescriptions:inDomain:]): Ditto
            * ProtocolHandlers.subproj/WebCFNetworkHTTPProtocolHandler.m:
            (-[WebCFNetworkHTTPProtocolHandler continueBeginLoadInBackgroundAfterCreatingHTTPRequest]): WebFoundation error code constant na
    
    WebKit:
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge reportBadURL:]): WebFoundation error code constant name change
            * WebView.subproj/WebView.m:
            (+[WebView initialize]): WebError addErrorsFromDictionary changed to addErrorsWithCodesAndDescriptions
    
    WebBrowser:
    
    	Modified code to work with new WebError API.
    
            * DownloadProgressEntry.m:
            (+[DownloadProgressEntry entryWithDictionary:]): Modified for new "no terminal error" WebError API
            (-[DownloadProgressEntry stop]): WebFoundation error code constant name change
            * FrameProgressEntry.m:
            (-[FrameProgressEntry stage]): Ditto
            * LocationChangeError.m:
            (-[LocationChangeHandler specializedTitleForError:]): Ditto
            (-[LocationChangeHandler specializedMessageForError:]): Ditto
            (-[LocationChangeHandler displayLocationChangeError:]): Ditto
            * LocationChangeHandler.m:
            (-[LocationChangeHandler locationChangeDone:forDataSource:]): Modified for new "no terminal error" WebError API
            * Preferences.subproj/SecurityPreferences.m:
            (-[SecurityPreferences updateCookiesViews]): Fixed unitialized variable build breaker I encountered when doing a Deployment build.
            * ResourceProgressEntry.m:
            (-[ResourceProgressEntry stage]): WebFoundation error code constant name change
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8612d0d..24e478e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-23  Ken Kocienda  <kocienda at apple.com>
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge reportBadURL:]): WebFoundation error code constant name change
+        * WebView.subproj/WebView.m:
+        (+[WebView initialize]): WebError addErrorsFromDictionary changed to addErrorsWithCodesAndDescriptions
+
 2002-09-22  Darin Adler  <darin at apple.com>
 
 	- fixed 3057380 -- insertion point shows through elements in front of text fields
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8612d0d..24e478e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-23  Ken Kocienda  <kocienda at apple.com>
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge reportBadURL:]): WebFoundation error code constant name change
+        * WebView.subproj/WebView.m:
+        (+[WebView initialize]): WebError addErrorsFromDictionary changed to addErrorsWithCodesAndDescriptions
+
 2002-09-22  Darin Adler  <darin at apple.com>
 
 	- fixed 3057380 -- insertion point shows through elements in front of text fields
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 41f2956..3bc9b63 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -309,7 +309,7 @@
 
 - (void)reportBadURL:(NSString *)badURL
 {
-    WebError *badURLError = [[WebError alloc] initWithErrorCode:WebResultBadURLError
+    WebError *badURLError = [[WebError alloc] initWithErrorCode:WebErrorCodeBadURLError
                                                         inDomain:WebErrorDomainWebFoundation
                                                         failingURL:badURL];
     [[frame controller] _receivedError:badURLError
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 30a2e8f..bc9d97b 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -51,7 +51,7 @@ enum {
     WebErrorDescriptionCannotFindApplicationForURL, 	[NSNumber numberWithInt: WebErrorCannotNotFindApplicationForURL],
     nil];
 
-    [WebError addErrorsFromDictionary:dict];
+    [WebError addErrorsWithCodesAndDescriptions:dict inDomain:WebErrorDomainWebKit];
 }
 
 - initWithFrame: (NSRect) frame

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list