[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 05:56:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6acf0d5f1b2be5c8dc90a9e1a32d0977aa1b397f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 22 02:40:48 2002 +0000
Stop support.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@653 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4b89e19..d0e55b9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-02-21 Richard Williamson <rjw at apple.com>
+
+ Stop mostly working.
+
+ * src/kwq/KWQKjobclasses.mm:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandleResourceDidCancelLoading:userData:]), (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:userData:]), (-[URLLoadClient
+ WCURLHandle:resourceDidFailLoadingWithResult:userData:]),
+ (Loader::servePendingRequests):
+ * src/kwq/kio/jobclasses.h:
+
2002-02-21 Maciej Stachowiak <mjs at apple.com>
* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4b89e19..d0e55b9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-02-21 Richard Williamson <rjw at apple.com>
+
+ Stop mostly working.
+
+ * src/kwq/KWQKjobclasses.mm:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandleResourceDidCancelLoading:userData:]), (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:userData:]), (-[URLLoadClient
+ WCURLHandle:resourceDidFailLoadingWithResult:userData:]),
+ (Loader::servePendingRequests):
+ * src/kwq/kio/jobclasses.h:
+
2002-02-21 Maciej Stachowiak <mjs at apple.com>
* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4b89e19..d0e55b9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-02-21 Richard Williamson <rjw at apple.com>
+
+ Stop mostly working.
+
+ * src/kwq/KWQKjobclasses.mm:
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandleResourceDidCancelLoading:userData:]), (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:userData:]), (-[URLLoadClient
+ WCURLHandle:resourceDidFailLoadingWithResult:userData:]),
+ (Loader::servePendingRequests):
+ * src/kwq/kio/jobclasses.h:
+
2002-02-21 Maciej Stachowiak <mjs at apple.com>
* src/kwq/KWQString.mm: (QString::fromCFString): Don't pass a
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index bd1069f..9c5d9b0 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -169,8 +169,10 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
void begin(id <WCURLHandleClient> client, void *userData);
+ id handle();
#else
void begin(void *requestor, void *userData);
+ void *handle();
#endif
KURL url() { return _url; }
#endif
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index 558d085..cb5df55 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -181,6 +181,9 @@ void TransferJob::begin(id <WCURLHandleClient> client, void *userData)
[d->handle loadInBackground];
}
+id TransferJob::handle() { return d->handle; }
+
+
} // namespace KIO
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index b30632b..b240e7a 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -931,6 +931,7 @@ typedef enum {
@end
@class IFError;
+ at class IFURLHandle;
@protocol IFLoadHandler
- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
@@ -940,6 +941,8 @@ typedef enum {
@end
@interface IFWebDataSource
+- (void)_addURLHandle: (IFURLHandle *)handle;
+- (void)_removeURLHandle: (IFURLHandle *)handle;
- controller;
@end
@@ -966,6 +969,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
@@ -973,6 +978,8 @@ typedef enum {
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
+ [m_dataSource _removeURLHandle: job->handle()];
+
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1007,6 +1014,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
@@ -1098,6 +1107,7 @@ void Loader::servePendingRequests()
//job->begin(d->m_recv, job);
job->begin((URLLoadClient *)req->client, job);
+ [((URLLoadClient *)req->client)->m_dataSource _addURLHandle: job->handle()];
#else
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index b30632b..b240e7a 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -931,6 +931,7 @@ typedef enum {
@end
@class IFError;
+ at class IFURLHandle;
@protocol IFLoadHandler
- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
@@ -940,6 +941,8 @@ typedef enum {
@end
@interface IFWebDataSource
+- (void)_addURLHandle: (IFURLHandle *)handle;
+- (void)_removeURLHandle: (IFURLHandle *)handle;
- controller;
@end
@@ -966,6 +969,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
@@ -973,6 +978,8 @@ typedef enum {
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
+ [m_dataSource _removeURLHandle: job->handle()];
+
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1007,6 +1014,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
@@ -1098,6 +1107,7 @@ void Loader::servePendingRequests()
//job->begin(d->m_recv, job);
job->begin((URLLoadClient *)req->client, job);
+ [((URLLoadClient *)req->client)->m_dataSource _addURLHandle: job->handle()];
#else
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index b30632b..b240e7a 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -931,6 +931,7 @@ typedef enum {
@end
@class IFError;
+ at class IFURLHandle;
@protocol IFLoadHandler
- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
@@ -940,6 +941,8 @@ typedef enum {
@end
@interface IFWebDataSource
+- (void)_addURLHandle: (IFURLHandle *)handle;
+- (void)_removeURLHandle: (IFURLHandle *)handle;
- controller;
@end
@@ -966,6 +969,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
@@ -973,6 +978,8 @@ typedef enum {
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
+ [m_dataSource _removeURLHandle: job->handle()];
+
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1007,6 +1014,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
@@ -1098,6 +1107,7 @@ void Loader::servePendingRequests()
//job->begin(d->m_recv, job);
job->begin((URLLoadClient *)req->client, job);
+ [((URLLoadClient *)req->client)->m_dataSource _addURLHandle: job->handle()];
#else
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index bd1069f..9c5d9b0 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -169,8 +169,10 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
void begin(id <WCURLHandleClient> client, void *userData);
+ id handle();
#else
void begin(void *requestor, void *userData);
+ void *handle();
#endif
KURL url() { return _url; }
#endif
diff --git a/WebCore/src/kwq/KWQKjobclasses.mm b/WebCore/src/kwq/KWQKjobclasses.mm
index 558d085..cb5df55 100644
--- a/WebCore/src/kwq/KWQKjobclasses.mm
+++ b/WebCore/src/kwq/KWQKjobclasses.mm
@@ -181,6 +181,9 @@ void TransferJob::begin(id <WCURLHandleClient> client, void *userData)
[d->handle loadInBackground];
}
+id TransferJob::handle() { return d->handle; }
+
+
} // namespace KIO
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index b30632b..b240e7a 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -931,6 +931,7 @@ typedef enum {
@end
@class IFError;
+ at class IFURLHandle;
@protocol IFLoadHandler
- (void)receivedProgress: (IFLoadProgress *)progress forResource: (NSString *)resourceDescription fromDataSource: (IFWebDataSource *)dataSource;
@@ -940,6 +941,8 @@ typedef enum {
@end
@interface IFWebDataSource
+- (void)_addURLHandle: (IFURLHandle *)handle;
+- (void)_removeURLHandle: (IFURLHandle *)handle;
- controller;
@end
@@ -966,6 +969,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
@@ -973,6 +978,8 @@ typedef enum {
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
QString urlString = job->url().url();
+ [m_dataSource _removeURLHandle: job->handle()];
+
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, urlString.latin1());
m_loader->slotFinished(job);
@@ -1007,6 +1014,8 @@ typedef enum {
{
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
KWQDEBUGLEVEL2 (0x2000, "dataSource = 0x%08x for URL %s\n", m_dataSource, job->url().url().latin1());
+
+ [m_dataSource _removeURLHandle: job->handle()];
}
@@ -1098,6 +1107,7 @@ void Loader::servePendingRequests()
//job->begin(d->m_recv, job);
job->begin((URLLoadClient *)req->client, job);
+ [((URLLoadClient *)req->client)->m_dataSource _addURLHandle: job->handle()];
#else
KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
diff --git a/WebCore/src/kwq/kio/jobclasses.h b/WebCore/src/kwq/kio/jobclasses.h
index bd1069f..9c5d9b0 100644
--- a/WebCore/src/kwq/kio/jobclasses.h
+++ b/WebCore/src/kwq/kio/jobclasses.h
@@ -169,8 +169,10 @@ public:
#ifdef _KWQ_
#if (defined(__APPLE__) && defined(__OBJC__) && defined(__cplusplus))
void begin(id <WCURLHandleClient> client, void *userData);
+ id handle();
#else
void begin(void *requestor, void *userData);
+ void *handle();
#endif
KURL url() { return _url; }
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list