[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:35:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit aa87322645a0ce422ac6f87bb399bbe87ec17ecd
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 3 16:50:55 2002 +0000
WebFoundation:
More work on WebFoundation refactoring. This change concentrates on two
major areas:
1) Cleaning up the WebResourceHandle class by separating out the methods
of this class into separate files based on method visibility.
2) Added a new WebResourceRequest class that serves to collect the
information about a load request instead of having this information
sprinkled through the WebResourceHandle class.
With this initial WebResourceRequest revision, there isn't very much extra or
different about the API or the way clients use WebFoundation. Further changes
are planned very soon. These upcoming changes and will modify and enhance the API.
Note that these changes, while they touch a lot of code, should not break any
functionality of the framework or of Alexander.
WebKit:
Modify calls into WebFoundation to use the new WebResourceRequest class,
and the modified API that kicks off load requests using WebResourceHandle.
More changes are planned for this code as the WebFoundation API modifications
progress.
* Misc.subproj/WebIconDatabase.m:
(-[WebIconDatabase _iconForFileURL:withSize:])
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading])
* Plugins.subproj/WebPluginStream.m:
(-[WebNetscapePluginStream startLoad])
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge objectLoadedFromCache:size:])
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:dataSource:])
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebControllerPrivate.m:
(-[WebController _receivedError:forResourceHandle:partialProgress:fromDataSource:])
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _startLoading:])
WebBrowser:
Small tweaks to use new WebFoundation WebResourceRequest object when requesting
the "original URL" for a load.
* BrowserWebController.m:
(-[BrowserWebController receivedProgress:forResourceHandle:fromDataSource:complete:])
(-[BrowserWebController receivedError:forResourceHandle:partialProgress:fromDataSource:])
* WebBrowser.pbproj/project.pbxproj
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2f57aff..9cffaa3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2002-09-03 Ken Kocienda <kocienda at apple.com>
+
+ Modify calls into WebFoundation to use the new WebResourceRequest class,
+ and the modified API that kicks off load requests using WebResourceHandle.
+ More changes are planned for this code as the WebFoundation API modifications
+ progress.
+
+ * Misc.subproj/WebIconDatabase.m:
+ (-[WebIconDatabase _iconForFileURL:withSize:])
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:dataSource:])
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _receivedError:forResourceHandle:partialProgress:fromDataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading:])
+
2002-09-03 Darin Adler <darin at apple.com>
Fix a reproducible crash pulling down the Go menu.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2f57aff..9cffaa3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,26 @@
+2002-09-03 Ken Kocienda <kocienda at apple.com>
+
+ Modify calls into WebFoundation to use the new WebResourceRequest class,
+ and the modified API that kicks off load requests using WebResourceHandle.
+ More changes are planned for this code as the WebFoundation API modifications
+ progress.
+
+ * Misc.subproj/WebIconDatabase.m:
+ (-[WebIconDatabase _iconForFileURL:withSize:])
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading])
+ * Plugins.subproj/WebPluginStream.m:
+ (-[WebNetscapePluginStream startLoad])
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge objectLoadedFromCache:size:])
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:dataSource:])
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _receivedError:forResourceHandle:partialProgress:fromDataSource:])
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _startLoading:])
+
2002-09-03 Darin Adler <darin at apple.com>
Fix a reproducible crash pulling down the Go menu.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 2394897..e4f1761 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -14,6 +14,8 @@
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceLoadManager.h>
+#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
@interface WebIconLoaderPrivate : NSObject
{
@@ -129,7 +131,9 @@
return;
}
- _private->handle = [[WebResourceHandle alloc] initWithClient:self URL:_private->URL];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:self URL:_private->URL];
+ _private->handle = [[WebResourceHandle alloc] initWithRequest:request];
+ [request release];
if (_private->handle) {
[_private->handle loadInBackground];
}
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 48f7044..337be69 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -13,6 +13,7 @@
#import <WebFoundation/WebFoundation.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
+#import <WebFoundation/WebResourceRequest.h>
@interface WebNetscapePluginStream (ClassInternal)
- (void)receivedData:(NSData *)data;
@@ -95,8 +96,10 @@
- (void)startLoad
{
- resource = [[WebResourceHandle alloc] initWithClient:self URL:URL attributes:attributes flags:0];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:self URL:URL attributes:attributes flags:0];
+ resource = [[WebResourceHandle alloc] initWithRequest:request];
[resource loadInBackground];
+ [request release];
}
- (void)stop
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 8fdce67..7d80df3 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -20,6 +20,7 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
@interface NSApplication (DeclarationStolenFromAppKit)
- (void)_cycleWindowsReversed:(BOOL)reversed;
@@ -186,11 +187,13 @@
{
WEBKIT_ASSERT(frame != nil);
- WebResourceHandle *handle = [[WebResourceHandle alloc] initWithClient:nil URL:URL];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:nil URL:URL];
+ WebResourceHandle *handle = [[WebResourceHandle alloc] initWithRequest:request];
WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
[[frame controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource:[self dataSource] complete:YES];
[loadProgress release];
[handle release];
+ [request release];
}
- (BOOL)isReloading
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 59c56ae..c5f8026 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -10,6 +10,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -60,8 +61,10 @@
withURL:(NSURL *)URL dataSource:(WebDataSource *)source
{
WebSubresourceClient *client = [[self alloc] initWithLoader:rLoader dataSource:source];
- WebResourceHandle *handle = [[[WebResourceHandle alloc] initWithClient:client URL:URL attributes:nil flags:[source flags]] autorelease];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:client URL:URL attributes:nil flags:[source flags]];
+ WebResourceHandle *handle = [[[WebResourceHandle alloc] initWithRequest:request] autorelease];
[client release];
+ [request release];
if (handle == nil) {
[rLoader cancel];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 59c56ae..c5f8026 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -10,6 +10,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -60,8 +61,10 @@
withURL:(NSURL *)URL dataSource:(WebDataSource *)source
{
WebSubresourceClient *client = [[self alloc] initWithLoader:rLoader dataSource:source];
- WebResourceHandle *handle = [[[WebResourceHandle alloc] initWithClient:client URL:URL attributes:nil flags:[source flags]] autorelease];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:client URL:URL attributes:nil flags:[source flags]];
+ WebResourceHandle *handle = [[[WebResourceHandle alloc] initWithRequest:request] autorelease];
[client release];
+ [request release];
if (handle == nil) {
[rLoader cancel];
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 44ac563..d3427eb 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1563,16 +1563,19 @@
};
};
F528E3E9031E91AD01CA2ACA = {
+ fileEncoding = 30;
isa = PBXFileReference;
path = WebIconDatabase.h;
refType = 4;
};
F528E3EA031E91AD01CA2ACA = {
+ fileEncoding = 30;
isa = PBXFileReference;
path = WebIconDatabase.m;
refType = 4;
};
F528E3EB031E91AD01CA2ACA = {
+ fileEncoding = 30;
isa = PBXFileReference;
path = WebIconDatabasePrivate.h;
refType = 4;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 26df176..0b0b87a 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -20,6 +20,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
@implementation WebControllerPrivate
@@ -135,7 +136,7 @@
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
- NSString *resourceIdentifier = [[resourceHandle originalURL] absoluteString];
+ NSString *resourceIdentifier = [[[resourceHandle request] URL] absoluteString];
if (resourceIdentifier == nil) {
resourceIdentifier = [error failingURL];
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 2b85125..dd36faa 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -33,6 +33,7 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
#import <WebCore/WebCoreEncodings.h>
@@ -189,7 +190,9 @@
// Fire this guy up.
if (!_private->mainHandle) {
_private->mainHandleClient = [[WebMainResourceClient alloc] initWithDataSource: self];
- _private->mainHandle = [[WebResourceHandle alloc] initWithClient:_private->mainHandleClient URL:_private->inputURL attributes:_private->attributes flags:_private->flags];
+ WebResourceRequest *request = [[WebResourceRequest alloc] initWithClient:_private->mainHandleClient URL:_private->inputURL attributes:_private->attributes flags:_private->flags];
+ _private->mainHandle = [[WebResourceHandle alloc] initWithRequest:request];
+ [request release];
}
[_private->mainHandle loadInBackground];
}
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 26df176..0b0b87a 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -20,6 +20,7 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceRequest.h>
@implementation WebControllerPrivate
@@ -135,7 +136,7 @@
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
- NSString *resourceIdentifier = [[resourceHandle originalURL] absoluteString];
+ NSString *resourceIdentifier = [[[resourceHandle request] URL] absoluteString];
if (resourceIdentifier == nil) {
resourceIdentifier = [error failingURL];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list