[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:48:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1633de422d8b6aa73d99af9c7480352ceea4b65b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 9 21:11:47 2002 +0000
Cleaned up and made a little more useful as an example for
WebKit root.
* SimpleViewer/ApplicationController.h:
* SimpleViewer/ApplicationController.m:
(-[ApplicationController validateUserInterfaceItem:]):
* SimpleViewer/DocumentController.h:
* SimpleViewer/DocumentController.m:
(-[DocumentController dealloc]):
(-[DocumentController loadURL:]):
(-[DocumentController windowWillClose:]):
(-[LocationChangeDelegate dealloc]):
(-[LocationChangeDelegate locationChangeStartedForDataSource:]):
(-[LocationChangeDelegate locationChangeDone:forDataSource:]):
(-[ResourceLoadDelegate resourceRequest:willSendRequest:fromDataSource:]):
(-[ResourceLoadDelegate resourceRequest:didFinishLoadingFromDataSource:]):
(-[ResourceLoadDelegate resourceRequest:didFailLoadingWithError:fromDataSource:]):
* SimpleViewer/English.lproj/Document.nib:
* SimpleViewer/English.lproj/MainMenu.nib:
* SimpleViewer/English.lproj/Thumbnail.nib: Removed.
* SimpleViewer/SimpleViewer.pbproj/project.pbxproj:
* SimpleViewer/ThumbnailController.h: Removed.
* SimpleViewer/ThumbnailController.m: Removed.
* SimpleViewer/ThumbnailView.h: Removed.
* SimpleViewer/ThumbnailView.m: Removed.
Guarantee that resource progress messages arrive
before final locationChangeDone message.
* WebCoreSupport.subproj/WebSubresourceClient.m:
(-[WebSubresourceClient handleDidFinishLoading:]):
* WebKit.exp:
* WebView.subproj/WebController.m:
(-[WebResourceLoadDelegate resourceRequest:willSendRequest:fromDataSource:]):
(-[WebResourceLoadDelegate resourceRequest:didReceiveResponse:fromDataSource:]):
(-[WebResourceLoadDelegate resourceRequest:didReceiveContentLength:fromDataSource:]):
(-[WebResourceLoadDelegate resourceRequest:didFinishLoadingFromDataSource:]):
(-[WebResourceLoadDelegate resourceRequest:didFailLoadingWithError:fromDataSource:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient handleDidFinishLoading:]):
* WebView.subproj/WebResourceLoadDelegate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2293 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1e3d69f..bb767ac 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-10-09 Richard Williamson <rjw at apple.com>
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient handleDidFinishLoading:]):
+ * WebKit.exp:
+ * WebView.subproj/WebController.m:
+ (-[WebResourceLoadDelegate resourceRequest:willSendRequest:fromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didReceiveResponse:fromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didReceiveContentLength:fromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didFinishLoadingFromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didFailLoadingWithError:fromDataSource:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handleDidFinishLoading:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+
2002-10-09 John Sullivan <sullivan at apple.com>
- removed unnecessary concept of unique identifiers for bookmarks
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1e3d69f..bb767ac 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-10-09 Richard Williamson <rjw at apple.com>
+
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (-[WebSubresourceClient handleDidFinishLoading:]):
+ * WebKit.exp:
+ * WebView.subproj/WebController.m:
+ (-[WebResourceLoadDelegate resourceRequest:willSendRequest:fromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didReceiveResponse:fromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didReceiveContentLength:fromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didFinishLoadingFromDataSource:]):
+ (-[WebResourceLoadDelegate resourceRequest:didFailLoadingWithError:fromDataSource:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handleDidFinishLoading:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+
2002-10-09 John Sullivan <sullivan at apple.com>
- removed unnecessary concept of unique identifiers for bookmarks
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index ef4c05c..151daa8 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -188,15 +188,15 @@
[self receivedError:nonTerminalError];
}
+ [resourceProgressDelegate resourceRequest:request didFinishLoadingFromDataSource:dataSource];
+
[self receivedProgressWithComplete:YES];
[self didStopLoading];
[handle release];
handle = nil;
-
- [resourceProgressDelegate resourceRequest:request didFinishLoadingFromDataSource:dataSource];
-
+
[self release];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index ef4c05c..151daa8 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -188,15 +188,15 @@
[self receivedError:nonTerminalError];
}
+ [resourceProgressDelegate resourceRequest:request didFinishLoadingFromDataSource:dataSource];
+
[self receivedProgressWithComplete:YES];
[self didStopLoading];
[handle release];
handle = nil;
-
- [resourceProgressDelegate resourceRequest:request didFinishLoadingFromDataSource:dataSource];
-
+
[self release];
}
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 7fc69c5..20737e7 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -16,8 +16,10 @@
.objc_class_name_WebIconDatabase
.objc_class_name_WebIconLoader
.objc_class_name_WebKitStatistics
+.objc_class_name_WebLocationChangeDelegate
.objc_class_name_WebPreferences
.objc_class_name_WebRenderNode
+.objc_class_name_WebResourceLoadDelegate
.objc_class_name_WebStandardPanels
.objc_class_name_WebStringTruncator
.objc_class_name_WebTestController
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 012b95e..3c38aa4 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -463,3 +463,29 @@ NSString *WebElementFrameKey = @"WebElementFrame";
}
@end
+
+ at implementation WebResourceLoadDelegate
+
+-(WebResourceRequest *)resourceRequest:(WebResourceRequest *)oldRequest willSendRequest: (WebResourceRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+{
+ return newRequest;
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didReceiveResponse: (WebResourceResponse *)response fromDataSource:(WebDataSource *)dataSource
+{
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
+{
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didFinishLoadingFromDataSource:(WebDataSource *)dataSource
+{
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
+{
+}
+
+
+ at end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 8596158..748d710 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -168,14 +168,6 @@
[[dataSource representation] finishedLoadingWithDataSource:dataSource];
}
- // Either send a final error message or a final progress message.
- WebError *nonTerminalError = [[dataSource response] error];
- if (nonTerminalError) {
- [self receivedError:nonTerminalError forHandle:handle];
- } else {
- [self receivedProgressWithHandle:handle complete:YES];
- }
-
if (downloadHandler) {
WebError *downloadError = [downloadHandler finishedLoading];
if (downloadError) {
@@ -187,6 +179,14 @@
}
else
[resourceProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
+
+ // Either send a final error message or a final progress message.
+ WebError *nonTerminalError = [[dataSource response] error];
+ if (nonTerminalError) {
+ [self receivedError:nonTerminalError forHandle:handle];
+ } else {
+ [self receivedProgressWithHandle:handle complete:YES];
+ }
[self didStopLoading];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 8596158..748d710 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -168,14 +168,6 @@
[[dataSource representation] finishedLoadingWithDataSource:dataSource];
}
- // Either send a final error message or a final progress message.
- WebError *nonTerminalError = [[dataSource response] error];
- if (nonTerminalError) {
- [self receivedError:nonTerminalError forHandle:handle];
- } else {
- [self receivedProgressWithHandle:handle complete:YES];
- }
-
if (downloadHandler) {
WebError *downloadError = [downloadHandler finishedLoading];
if (downloadError) {
@@ -187,6 +179,14 @@
}
else
[resourceProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
+
+ // Either send a final error message or a final progress message.
+ WebError *nonTerminalError = [[dataSource response] error];
+ if (nonTerminalError) {
+ [self receivedError:nonTerminalError forHandle:handle];
+ } else {
+ [self receivedProgressWithHandle:handle complete:YES];
+ }
[self didStopLoading];
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 52247ee..065c1ff 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -63,3 +63,15 @@
@end
+/*!
+ @class WebResourceLoadDelegate
+ @discussion The WebResourceLoadDelegate class responds to all WebResourceLoadDelegate protocol
+ methods by doing nothing, except for resourceRequest:willSendRequest:fromDataSource:, which
+ will return the newRequest. It's provided for the convenience of clients who only want
+ to implement some of the above methods and ignore others.
+*/
+ at interface WebResourceLoadDelegate : NSObject <WebResourceLoadDelegate>
+{
+}
+ at end
+
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 012b95e..3c38aa4 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -463,3 +463,29 @@ NSString *WebElementFrameKey = @"WebElementFrame";
}
@end
+
+ at implementation WebResourceLoadDelegate
+
+-(WebResourceRequest *)resourceRequest:(WebResourceRequest *)oldRequest willSendRequest: (WebResourceRequest *)newRequest fromDataSource:(WebDataSource *)dataSource
+{
+ return newRequest;
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didReceiveResponse: (WebResourceResponse *)response fromDataSource:(WebDataSource *)dataSource
+{
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource
+{
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didFinishLoadingFromDataSource:(WebDataSource *)dataSource
+{
+}
+
+-(void)resourceRequest:(WebResourceRequest *)request didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource
+{
+}
+
+
+ at end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list