[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 8f9f9508661748099b5a42e207e61efe024fb378
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 22 22:45:58 2002 +0000

        Additional additional callback when resource is first loaded.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index cf46fd8..eecee7d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-05-22  Richard J. Williamson  <rjw at apple.com>
+    
+
+    Additional additional callback when resource is first loaded.
+        
+	* kwq/KWQKloader.mm:
+	(-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+
 2002-05-21  Richard J. Williamson  <rjw at apple.com>
 
     Lots of changes for DHTML.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cf46fd8..eecee7d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-05-22  Richard J. Williamson  <rjw at apple.com>
+    
+
+    Additional additional callback when resource is first loaded.
+        
+	* kwq/KWQKloader.mm:
+	(-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+
 2002-05-21  Richard J. Williamson  <rjw at apple.com>
 
     Lots of changes for DHTML.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cf46fd8..eecee7d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-05-22  Richard J. Williamson  <rjw at apple.com>
+    
+
+    Additional additional callback when resource is first loaded.
+        
+	* kwq/KWQKloader.mm:
+	(-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+
 2002-05-21  Richard J. Williamson  <rjw at apple.com>
 
     Lots of changes for DHTML.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index e8a0a1f..c14c2b5 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1021,9 +1021,26 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
 - (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
 {
+    id controller;
+	int contentLength = [sender contentLength];
+	int contentLengthReceived = [sender contentLengthReceived];
+    void *userData;
+
+    userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
+    
+    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
+    QString urlString = job->url().url();
+
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
                   static_cast<KIO::TransferJob *>(
                   [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
+
+    IFLoadProgress *loadProgress = WCIFLoadProgressMake();
+    loadProgress->totalToLoad = contentLength;
+    loadProgress->bytesSoFar = contentLengthReceived;
+    
+    controller = [m_dataSource controller];
+    [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 }
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index e8a0a1f..c14c2b5 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1021,9 +1021,26 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
 - (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
 {
+    id controller;
+	int contentLength = [sender contentLength];
+	int contentLengthReceived = [sender contentLengthReceived];
+    void *userData;
+
+    userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
+    
+    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
+    QString urlString = job->url().url();
+
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
                   static_cast<KIO::TransferJob *>(
                   [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
+
+    IFLoadProgress *loadProgress = WCIFLoadProgressMake();
+    loadProgress->totalToLoad = contentLength;
+    loadProgress->bytesSoFar = contentLengthReceived;
+    
+    controller = [m_dataSource controller];
+    [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 }
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index e8a0a1f..c14c2b5 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1021,9 +1021,26 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
 - (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
 {
+    id controller;
+	int contentLength = [sender contentLength];
+	int contentLengthReceived = [sender contentLengthReceived];
+    void *userData;
+
+    userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
+    
+    KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
+    QString urlString = job->url().url();
+
     KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
                   static_cast<KIO::TransferJob *>(
                   [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
+
+    IFLoadProgress *loadProgress = WCIFLoadProgressMake();
+    loadProgress->totalToLoad = contentLength;
+    loadProgress->bytesSoFar = contentLengthReceived;
+    
+    controller = [m_dataSource controller];
+    [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
 }
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender

-- 
WebKit Debian packaging