[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:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 182a031d6465e8e644f2e0ac93f54b92d3855a0c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 22 21:20:42 2002 +0000
Added data: to IFURLHandleResourceDidFinishLoading:.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@659 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 109874e..598383c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-02-22 Richard Williamson <rjw at apple.com>
+
+ Added data: to IFURLHandleResourceDidFinishLoading:
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]):
+
2002-02-22 Kenneth Kocienda <kocienda at apple.com>
Sent handle an autorelease message.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 109874e..598383c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-02-22 Richard Williamson <rjw at apple.com>
+
+ Added data: to IFURLHandleResourceDidFinishLoading:
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]):
+
2002-02-22 Kenneth Kocienda <kocienda at apple.com>
Sent handle an autorelease message.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 109874e..598383c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-02-22 Richard Williamson <rjw at apple.com>
+
+ Added data: to IFURLHandleResourceDidFinishLoading:
+
+ * include/WCURLHandle.h:
+ * src/kwq/KWQKHTMLPart.mm: (-[KHTMLPartLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]):
+
2002-02-22 Kenneth Kocienda <kocienda at apple.com>
Sent handle an autorelease message.
diff --git a/WebCore/include/WCURLHandle.h b/WebCore/include/WCURLHandle.h
index 1e0c120..721bc6d 100644
--- a/WebCore/include/WCURLHandle.h
+++ b/WebCore/include/WCURLHandle.h
@@ -11,7 +11,7 @@
- (void)WCURLHandleResourceDidBeginLoading:(id)sender userData:(void *)userData;
- (void)WCURLHandleResourceDidCancelLoading:(id)sender userData:(void *)userData;
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData;
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData;
- (void)WCURLHandle:(id)sender resourceDataDidBecomeAvailable:(NSData *)data userData:(void *)userData;
- (void)WCURLHandle:(id)sender resourceDidFailLoadingWithResult:(int)result userData:(void *)userData;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 25d7214..560a46a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -148,7 +148,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
m_part->closeURL();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 25d7214..560a46a 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -148,7 +148,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
m_part->closeURL();
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 916590a..39eaa01 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -974,22 +974,23 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
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());
+ KWQDEBUGLEVEL4 (0x2000, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+
m_loader->slotFinished(job);
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
- loadProgress->totalToLoad = 0;
- loadProgress->bytesSoFar = 0;
+ loadProgress->totalToLoad = [data length];
+ loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
[sender autorelease];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 916590a..39eaa01 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -974,22 +974,23 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
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());
+ KWQDEBUGLEVEL4 (0x2000, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+
m_loader->slotFinished(job);
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
- loadProgress->totalToLoad = 0;
- loadProgress->bytesSoFar = 0;
+ loadProgress->totalToLoad = [data length];
+ loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
[sender autorelease];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 916590a..39eaa01 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -974,22 +974,23 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
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());
+ KWQDEBUGLEVEL4 (0x2000, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+
m_loader->slotFinished(job);
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
- loadProgress->totalToLoad = 0;
- loadProgress->bytesSoFar = 0;
+ loadProgress->totalToLoad = [data length];
+ loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
[sender autorelease];
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 25d7214..560a46a 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -148,7 +148,7 @@ static void recursive(const DOM::Node &pNode, const DOM::Node &node)
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
KWQDEBUGLEVEL1 (0x2000, "userData = 0x%08x\n", userData);
m_part->closeURL();
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 916590a..39eaa01 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -974,22 +974,23 @@ typedef enum {
[sender autorelease];
}
-- (void)WCURLHandleResourceDidFinishLoading:(id)sender userData:(void *)userData
+- (void)WCURLHandleResourceDidFinishLoading:(id)sender data: (NSData *)data userData:(void *)userData
{
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());
+ KWQDEBUGLEVEL4 (0x2000, "dataSource = 0x%08x for URL %s data at 0x%08x, length %d\n", m_dataSource, urlString.latin1(), data, [data length]);
+
m_loader->slotFinished(job);
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
- loadProgress->totalToLoad = 0;
- loadProgress->bytesSoFar = 0;
+ loadProgress->totalToLoad = [data length];
+ loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
[sender autorelease];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c4236fc..d7348fb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
2002-02-22 Richard Williamson <rjw at apple.com>
+ Added data: to IFURLHandleResourceDidFinishLoading:
+
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource isLoading]):
+
+2002-02-22 Richard Williamson <rjw at apple.com>
+
Implemented missing getter for provisionalDataSource.
* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame provisionalDataSource]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c4236fc..d7348fb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
2002-02-22 Richard Williamson <rjw at apple.com>
+ Added data: to IFURLHandleResourceDidFinishLoading:
+
+ * WebView.subproj/IFWebDataSource.h:
+ * WebView.subproj/IFWebDataSource.mm: (-[IFWebDataSource isLoading]):
+
+2002-02-22 Richard Williamson <rjw at apple.com>
+
Implemented missing getter for provisionalDataSource.
* WebView.subproj/IFWebFrame.mm: (-[IFWebFrame provisionalDataSource]):
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 287276e..f565935 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -172,7 +172,6 @@
// Cancels any pending loads. A data source is conceptually only ever loading
// one document at a time, although one document may have many related
// resources. stopLoading will stop all loads related to the data source.
-// Returns NO if the data source is not currently loading.
- (void)stopLoading;
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 6eebb03..f33bccb 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -211,7 +211,6 @@
// one document at a time, although one document may have many related
// resources. stopLoading will stop all loads related to the data source. This
// method will also stop loads that may be loading in child frames.
-// Returns NO if the data source is not currently loading.
- (void)stopLoading
{
[self _recursiveStopLoading];
@@ -221,8 +220,9 @@
// Returns YES if there are any pending loads.
- (BOOL)isLoading
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isLoading is not implemented"];
- return NO;
+ // FIXME! Also need to account for main document.
+ IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
+ return [data->urlHandles count] ? YES : NO;
}
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 287276e..f565935 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -172,7 +172,6 @@
// Cancels any pending loads. A data source is conceptually only ever loading
// one document at a time, although one document may have many related
// resources. stopLoading will stop all loads related to the data source.
-// Returns NO if the data source is not currently loading.
- (void)stopLoading;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 6eebb03..f33bccb 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -211,7 +211,6 @@
// one document at a time, although one document may have many related
// resources. stopLoading will stop all loads related to the data source. This
// method will also stop loads that may be loading in child frames.
-// Returns NO if the data source is not currently loading.
- (void)stopLoading
{
[self _recursiveStopLoading];
@@ -221,8 +220,9 @@
// Returns YES if there are any pending loads.
- (BOOL)isLoading
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isLoading is not implemented"];
- return NO;
+ // FIXME! Also need to account for main document.
+ IFWebDataSourcePrivate *data = (IFWebDataSourcePrivate *)_dataSourcePrivate;
+ return [data->urlHandles count] ? YES : NO;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list