[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:46:06 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit b39bcc90ba79c06e9a58e4f1ada1b9274203b754
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 1 17:12:16 2002 +0000

    WebFoundation:
    
    	This change focuses on "status codes". Status codes are an enum that describe
    	the state of a handle's load (e.g. loading, finished, cancelled).
    
    	Removed status code from WebResourceResponse, and moved it to WebResourceHandle.
    	The status code is now available as private API on WebResourceHandle. This
    	change made it possible to make some nice cleanups and simplifications.
    
    	The great majority of these changes merely move the method calls from the old
    	design of calling WebResourceResponse to access the status code to calling
    	the WebResourceHandle to get the status code.
    
            * CacheLoader.subproj/IFURLHandleC.h:
            * CacheLoader.subproj/WebCacheLoaderConstants.h:
            * CacheLoader.subproj/WebResourceHandle.m:
            (+[WebResourceHandle sendSynchronousRequest:])
            (-[WebResourceHandle initWithRequest:])
            (-[WebResourceHandle loadWithDelegate:])
            (-[WebResourceHandle cancel])
            * CacheLoader.subproj/WebResourceHandleInternal.h:
            * CacheLoader.subproj/WebResourceHandlePrivate.h:
            * CacheLoader.subproj/WebResourceHandlePrivate.m:
            (-[WebResourceHandle _didReceiveResponseMetadata:])
            (-[WebResourceHandle _didLoadData:])
            (-[WebResourceHandle _backgroundLoadComplete])
            (-[WebResourceHandle _backgroundLoadFailed])
            (-[WebResourceHandle _didRedirectToURL:])
            (-[WebResourceHandle _load])
            (-[WebResourceHandle _statusCode])
            (-[WebResourceHandle _setStatusCode:])
            * CacheLoader.subproj/WebResourceLoad.h:
            * CacheLoader.subproj/WebResourceLoad.m:
            (-[WebResourceLoad cancel])
            (-[WebResourceLoad isCancelled])
            (-[WebResourceLoad succeeded])
            (-[WebResourceLoad failedWithResultCode:inDomain:failingURL:])
            (-[WebResourceLoad addHandle:])
            (-[WebResourceLoad _beginLoad])
            (_loadThrottler)
            * CacheLoader.subproj/WebResourceResponse.h:
            * CacheLoader.subproj/WebResourceResponse.m:
            (-[WebResourceResponse _setResourceData:])
            * CacheLoader.subproj/WebResourceResponsePrivate.h:
    
    WebKit:
    
            * WebView.subproj/WebLoadProgress.m:
            (-[WebLoadProgress initWithResourceHandle:]): Status code moved from WebResourceResponse
    	to WebResourceHandle private API.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8578da1..a4ee2a3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-10-01  Ken Kocienda  <kocienda at apple.com>
 
+        * WebView.subproj/WebLoadProgress.m:
+        (-[WebLoadProgress initWithResourceHandle:]): Status code moved from WebResourceResponse
+	to WebResourceHandle private API.
+
+2002-10-01  Ken Kocienda  <kocienda at apple.com>
+
         Changed WebResourceHandle so that the init method no longer starts the
         loading of the request to begin. Added new loadWithDelegate: method which
         is called separatetly from the init method, to start loads.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8578da1..a4ee2a3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-10-01  Ken Kocienda  <kocienda at apple.com>
 
+        * WebView.subproj/WebLoadProgress.m:
+        (-[WebLoadProgress initWithResourceHandle:]): Status code moved from WebResourceResponse
+	to WebResourceHandle private API.
+
+2002-10-01  Ken Kocienda  <kocienda at apple.com>
+
         Changed WebResourceHandle so that the init method no longer starts the
         loading of the request to begin. Added new loadWithDelegate: method which
         is called separatetly from the init method, to start loads.
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
index 52bd21b..ab2922f 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.m
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -35,7 +35,7 @@
         return [self init];
     }
     int b = [theResponse contentLengthReceived];
-    int t = [theResponse statusCode] == WebResourceHandleStatusLoadComplete ? b : [theResponse contentLength];
+    int t = [handle _statusCode] == WebResourceHandleStatusLoadComplete ? b : [theResponse contentLength];
     return [self initWithBytesSoFar:b totalToLoad:t];
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list