[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:36:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit eed893c74dc0ec935784dcbdf353eeef637c6895
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 5 19:39:46 2002 +0000
WebFoundation:
The first use of the WebResourceResponse object. This is just a baby step, though.
I only use one variable in the new class, the statusCode, but all the code in
the framework has been updated to use the statusCode from the response object.
All other references to status codes, be they in WebResourceHandle, or
WebResourceLoad, have been eliminated. More changes like this, where I rely
more and more on WebResourceResponse are to come.
* CacheLoader.subproj/IFURLHandleC.m:
(IFURLHandleGetStatusCode): Call through to response object to get status code.
* CacheLoader.subproj/WebCFNetworkHTTPProtocolHandler.m: Ditto.
(-[WebCFNetworkHTTPProtocolHandler continueAfterBytesAvailable]):Ditto.
(-[WebCFNetworkHTTPProtocolHandler handleReadStreamEvent:event:]):Ditto.
* CacheLoader.subproj/WebResourceHandle.h: Added accessor for WebResourceResponse ivar.
* CacheLoader.subproj/WebResourceHandle.m:
(-[WebResourceHandle cancelLoadInBackground]): Call through to response object to get status code.
(-[WebResourceHandle loadInForeground:]): Ditto.
(-[WebResourceHandle response]): Added.
* CacheLoader.subproj/WebResourceHandleInternal.h: Add WebResourceResponse ivar. Remove statusCode ivar.
* CacheLoader.subproj/WebResourceHandleInternal.m: Remove handle support for its own status code ivar.
(-[WebResourceHandleInstanceVariables initWithHandle:]):
(+[WebResourceHandle _registerDefaults]):
* CacheLoader.subproj/WebResourceHandlePrivate.h: Declare method to set a WebResourceResponse on a handle.
* CacheLoader.subproj/WebResourceHandlePrivate.m:
(-[WebResourceHandle _didLoadData:]): Call through to response object to get status code.
(-[WebResourceHandle _backgroundLoadComplete]): Ditto.
(-[WebResourceHandle _backgroundLoadFailed]): Ditto.
(-[WebResourceHandle _didRedirectToURL:]): Ditto.
(-[WebResourceHandle _setResponse:]): Added
* CacheLoader.subproj/WebResourceLoad.h: Remove load support for its own status code ivar. Add WebResourceResponse ivar.
* CacheLoader.subproj/WebResourceLoad.m:
(-[WebResourceLoad initWithRequest:]): Create new WebResourceResponse ivar.
(-[WebResourceLoad cancel]): Call through to response object to get status code.
(-[WebResourceLoad succeeded]): Ditto.
(-[WebResourceLoad failedWithResultCode:inDomain:failingURL:isTerminal:]): Ditto.
(-[WebResourceLoad addHandle:]): Set WebResourceResponse on the handle when it is added.
(-[WebResourceLoad _beginLoad]): Call through to response object to get status code.
(-[WebResourceLoad _beginOriginLoad]): Ditto.
(-[WebResourceLoad dealloc]): Release new WebResourceResponse instance.
(_loadThrottler): Call through to response object to get status code.
* CacheLoader.subproj/WebResourceResponse.m:
(-[WebResourceResponse init]): Added
(-[WebResourceResponse contentLength]): Implementation does not work yet, but nobody relies on it yet.
* CacheLoader.subproj/WebResourceResponsePrivate.h: Removed life-cycle methods I am going to try to do without.
* WebFoundation.pbproj/project.pbxproj:
WebKit:
The first use of the WebResourceResponse object. This is just a baby step, though.
I only use one variable in the new class, the statusCode, but all the code in
the framework has been updated to use the statusCode from the response object.
Each of these methods was modified to call through to a WebResourceResponse to get
the status code.
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient handleDidFinishLoading:])
* WebView.subproj/WebLoadProgress.m:
(-[WebLoadProgress initWithResourceHandle:])
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient handleDidFinishLoading:])
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1969 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 915b8c9..8211ada 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-09-05 Ken Kocienda <kocienda at apple.com>
+
+ The first use of the WebResourceResponse object. This is just a baby step, though.
+ I only use one variable in the new class, the statusCode, but all the code in
+ the framework has been updated to use the statusCode from the response object.
+
+ Each of these methods was modified to call through to a WebResourceResponse to get
+ the status code.
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient handleDidFinishLoading:])
+ * WebView.subproj/WebLoadProgress.m:
+ (-[WebLoadProgress initWithResourceHandle:])
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handleDidFinishLoading:])
+
2002-09-05 Richard Williamson (Local) <rjw at apple.com>
Only disable timed expiration of CG glyph cache if SPI is available.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 915b8c9..8211ada 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-09-05 Ken Kocienda <kocienda at apple.com>
+
+ The first use of the WebResourceResponse object. This is just a baby step, though.
+ I only use one variable in the new class, the statusCode, but all the code in
+ the framework has been updated to use the statusCode from the response object.
+
+ Each of these methods was modified to call through to a WebResourceResponse to get
+ the status code.
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient handleDidFinishLoading:])
+ * WebView.subproj/WebLoadProgress.m:
+ (-[WebLoadProgress initWithResourceHandle:])
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handleDidFinishLoading:])
+
2002-09-05 Richard Williamson (Local) <rjw at apple.com>
Only disable timed expiration of CG glyph cache if SPI is available.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 330f266..e667f3d 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -11,6 +11,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResourceResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -133,7 +134,7 @@
- (void)handleDidFinishLoading:(WebResourceHandle *)handle
{
WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
- WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
+ WEBKIT_ASSERT([[handle response] statusCode] == WebResourceHandleStatusLoadComplete);
[loader finish];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 330f266..e667f3d 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -11,6 +11,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceRequest.h>
+#import <WebFoundation/WebResourceResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -133,7 +134,7 @@
- (void)handleDidFinishLoading:(WebResourceHandle *)handle
{
WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
- WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
+ WEBKIT_ASSERT([[handle response] statusCode] == WebResourceHandleStatusLoadComplete);
[loader finish];
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
index 4748dcd..ae2258c 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.m
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -6,6 +6,7 @@
#import <WebKit/WebLoadProgress.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceResponse.h>
@implementation WebLoadProgress
@@ -29,7 +30,7 @@
- (id)initWithResourceHandle:(WebResourceHandle *)handle
{
int b = [handle contentLengthReceived];
- int t = [handle statusCode] == WebResourceHandleStatusLoadComplete ? b : [handle contentLength];
+ int t = [[handle response] statusCode] == WebResourceHandleStatusLoadComplete ? b : [handle contentLength];
return [self initWithBytesSoFar:b totalToLoad:t];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index be1051f..72bf7b0 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -21,6 +21,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceResponse.h>
// FIXME: This is quite similar to WebSubresourceClient; they should share code.
@@ -143,7 +144,7 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
- WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
+ WEBKIT_ASSERT([[handle response] statusCode] == WebResourceHandleStatusLoadComplete);
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index be1051f..72bf7b0 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -21,6 +21,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceResponse.h>
// FIXME: This is quite similar to WebSubresourceClient; they should share code.
@@ -143,7 +144,7 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s\n", DEBUG_OBJECT([handle URL]));
WEBKIT_ASSERT([currentURL isEqual:[handle URL]]);
- WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
+ WEBKIT_ASSERT([[handle response] statusCode] == WebResourceHandleStatusLoadComplete);
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list