[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:19:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2b96094331f48fa93cdfcbabc66857d83907aca3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jun 15 02:12:35 2002 +0000
Changed IFResourceProgressHandler to pass back resource handle instead of
string description. This will address the needs descibed in 2954160.
* kwq/KWQKloader.mm:
(-[KWQURLLoadClient IFURLHandleResourceDidBeginLoading:]):
(-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
(-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
(-[KWQURLLoadClient IFURLHandle:resourceDataDidBecomeAvailable:]):
(-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
(-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
(KWQLoaderImpl::serveRequest):
* kwq/external.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1365 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3082a07..faecb52 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-06-14 Richard Williamson <rjw at apple.com>
+
+ Changed IFResourceProgressHandler to pass back resource handle instead of
+ string description. This will address the needs descibed in 2954160.
+
+ * kwq/KWQKloader.mm:
+ (-[KWQURLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ (-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
+ (-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[KWQURLLoadClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ (-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
+ (KWQLoaderImpl::serveRequest):
+ * kwq/external.h:
+
2002-06-14 Darin Adler <darin at apple.com>
* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3082a07..faecb52 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-06-14 Richard Williamson <rjw at apple.com>
+
+ Changed IFResourceProgressHandler to pass back resource handle instead of
+ string description. This will address the needs descibed in 2954160.
+
+ * kwq/KWQKloader.mm:
+ (-[KWQURLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ (-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
+ (-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[KWQURLLoadClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ (-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
+ (KWQLoaderImpl::serveRequest):
+ * kwq/external.h:
+
2002-06-14 Darin Adler <darin at apple.com>
* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3082a07..faecb52 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-06-14 Richard Williamson <rjw at apple.com>
+
+ Changed IFResourceProgressHandler to pass back resource handle instead of
+ string description. This will address the needs descibed in 2954160.
+
+ * kwq/KWQKloader.mm:
+ (-[KWQURLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ (-[KWQURLLoadClient IFURLHandleResourceDidCancelLoading:]):
+ (-[KWQURLLoadClient IFURLHandleResourceDidFinishLoading:data:]):
+ (-[KWQURLLoadClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ (-[KWQURLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ (-[KWQURLLoadClient IFURLHandle:didRedirectToURL:]):
+ (KWQLoaderImpl::serveRequest):
+ * kwq/external.h:
+
2002-06-14 Darin Adler <darin at apple.com>
* kwq/KWQDateTime.mm: Add ifdefs needed to make Deployment build compile.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index c5a59ad..1882535 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -60,10 +60,8 @@ typedef enum {
@end
@interface IFWebController <IFLocationChangeHandler>
-- (void)_receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)handle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)handle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
- (void)_didStartLoading: (NSURL *)url;
- (void)_didStopLoading: (NSURL *)url;
@end
@@ -74,6 +72,7 @@ typedef enum {
- (void)_removeURLHandle: (IFURLHandle *)handle;
- (void)_setFinalURL: (NSURL *)url;
- representation;
+- (id <IFLocationChangeHandler>)_locationChangeHandler;
@end
@interface IFHTMLRepresentation : NSObject
@@ -145,7 +144,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStartLoading:job->url()];
}
@@ -170,7 +169,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = -1;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStopLoading:job->url()];
@@ -197,7 +196,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = [data length];
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStopLoading:job->url()];
@@ -232,7 +231,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
@@ -252,7 +251,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
job->setError(1);
m_loader->slotFinished(job);
- [(IFWebController *)controller _receivedError: result forResource: [job->url() absoluteString] partialProgress: loadProgress fromDataSource: m_dataSource];
+ [(IFWebController *)controller _receivedError: result forResourceHandle: sender partialProgress: loadProgress fromDataSource: m_dataSource];
[(IFWebController *)controller _didStopLoading:job->url()];
@@ -270,7 +269,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
[m_dataSource _setFinalURL: url];
- [(id <IFLocationChangeHandler>)[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
+ [[m_dataSource _locationChangeHandler] serverRedirectTo: url forDataSource: m_dataSource];
[(IFWebController *)[m_dataSource controller] _didStopLoading:oldURL];
[(IFWebController *)[m_dataSource controller] _didStartLoading:url];
}
@@ -301,11 +300,11 @@ void KWQLoaderImpl::serveRequest(Request *req, KIO::TransferJob *job)
job->begin(req->client, job);
if (job->handle() == nil) {
// Must be a malformed URL.
- NSString *urlString = QSTRING_TO_NSSTRING(req->object->url().string());
+ //NSString *urlString = QSTRING_TO_NSSTRING(req->object->url().string());
IFError *error = [IFError errorWithCode:IFURLHandleResultBadURLError inDomain:IFErrorCodeDomainWebFoundation isTerminal:YES];
id <IFLoadHandler> controller = [(req->client)->m_dataSource controller];
- [(IFWebController *)controller _receivedError: error forResource: urlString partialProgress: nil fromDataSource: req->client->m_dataSource];
+ [(IFWebController *)controller _receivedError: error forResourceHandle: nil partialProgress: nil fromDataSource: req->client->m_dataSource];
}
else {
[req->client->m_dataSource _addURLHandle: job->handle()];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index c5a59ad..1882535 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -60,10 +60,8 @@ typedef enum {
@end
@interface IFWebController <IFLocationChangeHandler>
-- (void)_receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)handle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)handle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
- (void)_didStartLoading: (NSURL *)url;
- (void)_didStopLoading: (NSURL *)url;
@end
@@ -74,6 +72,7 @@ typedef enum {
- (void)_removeURLHandle: (IFURLHandle *)handle;
- (void)_setFinalURL: (NSURL *)url;
- representation;
+- (id <IFLocationChangeHandler>)_locationChangeHandler;
@end
@interface IFHTMLRepresentation : NSObject
@@ -145,7 +144,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStartLoading:job->url()];
}
@@ -170,7 +169,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = -1;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStopLoading:job->url()];
@@ -197,7 +196,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = [data length];
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStopLoading:job->url()];
@@ -232,7 +231,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
@@ -252,7 +251,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
job->setError(1);
m_loader->slotFinished(job);
- [(IFWebController *)controller _receivedError: result forResource: [job->url() absoluteString] partialProgress: loadProgress fromDataSource: m_dataSource];
+ [(IFWebController *)controller _receivedError: result forResourceHandle: sender partialProgress: loadProgress fromDataSource: m_dataSource];
[(IFWebController *)controller _didStopLoading:job->url()];
@@ -270,7 +269,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
[m_dataSource _setFinalURL: url];
- [(id <IFLocationChangeHandler>)[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
+ [[m_dataSource _locationChangeHandler] serverRedirectTo: url forDataSource: m_dataSource];
[(IFWebController *)[m_dataSource controller] _didStopLoading:oldURL];
[(IFWebController *)[m_dataSource controller] _didStartLoading:url];
}
@@ -301,11 +300,11 @@ void KWQLoaderImpl::serveRequest(Request *req, KIO::TransferJob *job)
job->begin(req->client, job);
if (job->handle() == nil) {
// Must be a malformed URL.
- NSString *urlString = QSTRING_TO_NSSTRING(req->object->url().string());
+ //NSString *urlString = QSTRING_TO_NSSTRING(req->object->url().string());
IFError *error = [IFError errorWithCode:IFURLHandleResultBadURLError inDomain:IFErrorCodeDomainWebFoundation isTerminal:YES];
id <IFLoadHandler> controller = [(req->client)->m_dataSource controller];
- [(IFWebController *)controller _receivedError: error forResource: urlString partialProgress: nil fromDataSource: req->client->m_dataSource];
+ [(IFWebController *)controller _receivedError: error forResourceHandle: nil partialProgress: nil fromDataSource: req->client->m_dataSource];
}
else {
[req->client->m_dataSource _addURLHandle: job->handle()];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index c5a59ad..1882535 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -60,10 +60,8 @@ typedef enum {
@end
@interface IFWebController <IFLocationChangeHandler>
-- (void)_receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_receivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedError: (IFError *)error forResource: (NSString *)resourceDescription partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)handle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)handle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
- (void)_didStartLoading: (NSURL *)url;
- (void)_didStopLoading: (NSURL *)url;
@end
@@ -74,6 +72,7 @@ typedef enum {
- (void)_removeURLHandle: (IFURLHandle *)handle;
- (void)_setFinalURL: (NSURL *)url;
- representation;
+- (id <IFLocationChangeHandler>)_locationChangeHandler;
@end
@interface IFHTMLRepresentation : NSObject
@@ -145,7 +144,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStartLoading:job->url()];
}
@@ -170,7 +169,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = -1;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStopLoading:job->url()];
@@ -197,7 +196,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = [data length];
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
[controller _didStopLoading:job->url()];
@@ -232,7 +231,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
loadProgress->bytesSoFar = contentLengthReceived;
controller = [m_dataSource controller];
- [controller _receivedProgress: loadProgress forResource: [job->url() absoluteString] fromDataSource: m_dataSource];
+ [controller _receivedProgress: loadProgress forResourceHandle: sender fromDataSource: m_dataSource];
}
- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
@@ -252,7 +251,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
job->setError(1);
m_loader->slotFinished(job);
- [(IFWebController *)controller _receivedError: result forResource: [job->url() absoluteString] partialProgress: loadProgress fromDataSource: m_dataSource];
+ [(IFWebController *)controller _receivedError: result forResourceHandle: sender partialProgress: loadProgress fromDataSource: m_dataSource];
[(IFWebController *)controller _didStopLoading:job->url()];
@@ -270,7 +269,7 @@ void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
[m_dataSource _setFinalURL: url];
- [(id <IFLocationChangeHandler>)[m_dataSource controller] serverRedirectTo: url forDataSource: m_dataSource];
+ [[m_dataSource _locationChangeHandler] serverRedirectTo: url forDataSource: m_dataSource];
[(IFWebController *)[m_dataSource controller] _didStopLoading:oldURL];
[(IFWebController *)[m_dataSource controller] _didStartLoading:url];
}
@@ -301,11 +300,11 @@ void KWQLoaderImpl::serveRequest(Request *req, KIO::TransferJob *job)
job->begin(req->client, job);
if (job->handle() == nil) {
// Must be a malformed URL.
- NSString *urlString = QSTRING_TO_NSSTRING(req->object->url().string());
+ //NSString *urlString = QSTRING_TO_NSSTRING(req->object->url().string());
IFError *error = [IFError errorWithCode:IFURLHandleResultBadURLError inDomain:IFErrorCodeDomainWebFoundation isTerminal:YES];
id <IFLoadHandler> controller = [(req->client)->m_dataSource controller];
- [(IFWebController *)controller _receivedError: error forResource: urlString partialProgress: nil fromDataSource: req->client->m_dataSource];
+ [(IFWebController *)controller _receivedError: error forResourceHandle: nil partialProgress: nil fromDataSource: req->client->m_dataSource];
}
else {
[req->client->m_dataSource _addURLHandle: job->handle()];
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index 1868eda..bd046fa 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -45,7 +45,7 @@ namespace khtml {
@protocol IFLocationChangeHandler;
@interface IFWebController <IFLocationChangeHandler>
-- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource inScrollView: (BOOL)inScrollView;
+- (IFWebFrame *)createFrameNamed: (NSString *)name for: (IFWebDataSource *)dataSource inParent: (IFWebDataSource *)dataSource allowsScrolling: (BOOL)allowsScrolling;
- (IFWebFrame *)frameNamed: (NSString *)name;
- (IFWebFrame *)mainFrame;
- (IFWebController *)openNewWindowWithURL: (NSURL *)url;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list