[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:46:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3666660b93c2aed76f5e547a306e3beed3df9b46
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 3 22:06:59 2002 +0000
Renamed WebResourceProgressDelegate.h to WebResourceLoadDelegate.h
* BrowserWebController.m:
Renamed WebResourceProgressDelegate.h to WebResourceLoadDelegate.h
* Misc.subproj/WebKit.h:
* WebCoreSupport.subproj/WebSubresourceClient.m:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebController.m:
* WebView.subproj/WebControllerPrivate.m:
* WebView.subproj/WebMainResourceClient.m:
* WebView.subproj/WebResourceLoadDelegate.h:
* WebView.subproj/WebResourceProgressDelegate.h: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2237 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 53348d7..d08424e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
2002-10-03 Richard Williamson <rjw at apple.com>
+ Renamed WebResourceProgressDelegate.h to WebResourceLoadDelegate.h
+
+ * Misc.subproj/WebKit.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebControllerPrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebResourceProgressDelegate.h: Removed.
+
+2002-10-03 Richard Williamson <rjw at apple.com>
+
Changed to reflect new WebResourceLoadDelegate API.
* Misc.subproj/WebIconLoader.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 53348d7..d08424e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
2002-10-03 Richard Williamson <rjw at apple.com>
+ Renamed WebResourceProgressDelegate.h to WebResourceLoadDelegate.h
+
+ * Misc.subproj/WebKit.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebControllerPrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * WebView.subproj/WebResourceProgressDelegate.h: Removed.
+
+2002-10-03 Richard Williamson <rjw at apple.com>
+
Changed to reflect new WebResourceLoadDelegate API.
* Misc.subproj/WebIconLoader.m:
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index eab0d96..6015e96 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -19,7 +19,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPreferences.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStandardPanels.h>
#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index ff5ed1a..b5a1d7a 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -7,7 +7,7 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFrame.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index ff5ed1a..b5a1d7a 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -7,7 +7,7 @@
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFrame.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 7ea0bad..922609a 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -273,12 +273,12 @@
5152FAE1033FC50400CA2ACD,
5152FAE3033FC50400CA2ACD,
5152FAE7033FC52200CA2ACD,
- 5152FAEA033FC53500CA2ACD,
511D5554033FD51000CA2ACD,
933D659B03413FF2008635CE,
8398847C03426FB000BC5F5E,
84D4BFF90348EF7600CA2ACA,
84D4BFFD0348EF9D00CA2ACA,
+ 513D422F034CF55A00CA2ACD,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1086,6 +1086,22 @@
);
};
};
+ 513D422E034CF55A00CA2ACD = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebResourceLoadDelegate.h;
+ path = WebView.subproj/WebResourceLoadDelegate.h;
+ refType = 2;
+ };
+ 513D422F034CF55A00CA2ACD = {
+ fileRef = 513D422E034CF55A00CA2ACD;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
5152FAD5033FC43400CA2ACD = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -1231,22 +1247,6 @@
settings = {
};
};
- 5152FAE9033FC53500CA2ACD = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = WebResourceProgressDelegate.h;
- path = WebView.subproj/WebResourceProgressDelegate.h;
- refType = 2;
- };
- 5152FAEA033FC53500CA2ACD = {
- fileRef = 5152FAE9033FC53500CA2ACD;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
//510
//511
//512
@@ -1501,10 +1501,10 @@
5152FAE0033FC50400CA2ACD,
5152FAE5033FC52200CA2ACD,
5152FAE6033FC52200CA2ACD,
- 5152FAE9033FC53500CA2ACD,
511D5553033FD51000CA2ACD,
933D659903413FF2008635CE,
933D659A03413FF2008635CE,
+ 513D422E034CF55A00CA2ACD,
);
isa = PBXGroup;
name = WebView;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index aaf8d84..a063f2d 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -22,7 +22,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index ee5c9e3..d1a88ff 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -11,7 +11,7 @@
#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 007f82c..fa1ee1f 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -15,7 +15,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 007f82c..fa1ee1f 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -15,7 +15,7 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebView.h>
#import <WebFoundation/WebError.h>
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 6388bd4..52247ee 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -1,5 +1,5 @@
/*
- WebResourceProgressDelegate.h
+ WebResourceLoadDelegate.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
diff --git a/WebKit/WebView.subproj/WebResourceProgressDelegate.h b/WebKit/WebView.subproj/WebResourceProgressDelegate.h
deleted file mode 100644
index 6388bd4..0000000
--- a/WebKit/WebView.subproj/WebResourceProgressDelegate.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- WebResourceProgressDelegate.h
- Copyright 2001, 2002, Apple Computer, Inc.
-
- Public header file.
-*/
- at class WebResourceResponse;
- at class WebResourceRequest;
-
-/*!
- @protocol WebResourceLoadDelegate
- @discussion Implementors of this protocol will receive messages indicating
- that a resource is about to be loaded, data has been received for a resource,
- an error has been received for a resource, and completion of a resource load.
- Implementors are also given the opportunity to mutate a request before it is sent.
-*/
- at protocol WebResourceLoadDelegate <NSObject>
-
-/*!
- @method resourceRequest:willSendRequest:fromDataSource:
- @discussion This message is sent before a load is initiated. The request may be modified
- as necessary by the receiver.
- @param oldRequest The request about to be sent.
- @param newRequest The request about to be sent.
- @param dataSource The dataSource that initiated the load.
-*/
--(WebResourceRequest *)resourceRequest:(WebResourceRequest *)oldRequest willSendRequest: (WebResourceRequest *)newRequest fromDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method resourceRequest:didReceiveResponse:fromDataSource:
- @discussion This message is sent after a response has been received for this load.
- @param request The request that triggered the response.
- @param response The response for the request.
- @param dataSource The dataSource that initiated the load.
-*/
--(void)resourceRequest:(WebResourceRequest *)request didReceiveResponse: (WebResourceResponse *)response fromDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method resourceIdentifier:didReceiveContentLength:fromDataSource:
- @discussion Multiple of these messages may be sent as data arrives.
- @param request The request that represents the resource receiving data.
- @param length The amount of new data received. This is not the total amount, just the new amount received.
- @param dataSource The dataSource that initiated the load.
-*/
--(void)resourceRequest:(WebResourceRequest *)request didReceiveContentLength: (unsigned)length fromDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method resourceRequest: didFinishLoadingFromDataSource:
- @discussion This message is sent after a load has successfully completed.
- @param request The request that has successfully loaded.
- @param dataSource The dataSource that initiated the load.
-*/
--(void)resourceRequest:(WebResourceRequest *)request didFinishLoadingFromDataSource:(WebDataSource *)dataSource;
-
-/*!
- @method resourceRequest:didFailLoadingWithError:fromDataSource:
- @discussion This message is sent after a load has successfully completed.
- @param request The request that failed to load.
- @param error The error associated with this load.
- @param dataSource The dataSource that initiated the load.
-*/
--(void)resourceRequest:(WebResourceRequest *)request didFailLoadingWithError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
- at end
-
-
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index aaf8d84..a063f2d 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -22,7 +22,7 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitStatisticsPrivate.h>
#import <WebKit/WebPluginDatabase.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index ee5c9e3..d1a88ff 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -11,7 +11,7 @@
#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebPreferencesPrivate.h>
-#import <WebKit/WebResourceProgressDelegate.h>
+#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list