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

kocienda kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:10 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 6f26ff0d9bca4b39bacb3a26fb0462cbc2916ed1
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 27 21:54:03 2002 +0000

    2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
    
            Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
            instead of the size of the chunk that was delivered in the callback.
            This makes the activity window data more correct than it was.
    
    	WebCore:
    
            * src/kwq/KWQKloader.mm: (-[URLLoadClient
            IFURLHandle:resourceDataDidBecomeAvailable:]):
    
    
    	WebKit:
    
            * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
            IFURLHandle:resourceDataDidBecomeAvailable:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c375a30..44beb19 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
+
+        Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
+        instead of the size of the chunk that was delivered in the callback.
+        This makes the activity window data more correct than it was.
+        
+	* src/kwq/KWQKloader.mm: (-[URLLoadClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
 2002-03-27  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/ecma/Makefile.am: Get the create_hash_table tool
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c375a30..44beb19 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
+
+        Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
+        instead of the size of the chunk that was delivered in the callback.
+        This makes the activity window data more correct than it was.
+        
+	* src/kwq/KWQKloader.mm: (-[URLLoadClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
 2002-03-27  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/ecma/Makefile.am: Get the create_hash_table tool
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c375a30..44beb19 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
+
+        Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
+        instead of the size of the chunk that was delivered in the callback.
+        This makes the activity window data more correct than it was.
+        
+	* src/kwq/KWQKloader.mm: (-[URLLoadClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
 2002-03-27  Darin Adler  <darin at apple.com>
 
 	* src/kdelibs/khtml/ecma/Makefile.am: Get the create_hash_table tool
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index c3774c5..ebcce79 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1089,7 +1089,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     IFLoadProgress *loadProgress = WCIFLoadProgressMake();
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index c3774c5..ebcce79 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1089,7 +1089,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     IFLoadProgress *loadProgress = WCIFLoadProgressMake();
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index c3774c5..ebcce79 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1089,7 +1089,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     IFLoadProgress *loadProgress = WCIFLoadProgressMake();
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index c3774c5..ebcce79 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1089,7 +1089,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
 
     IFLoadProgress *loadProgress = WCIFLoadProgressMake();
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     
     controller = [m_dataSource controller];
     [controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 49e325d..6ebdfed 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
+
+        Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
+        instead of the size of the chunk that was delivered in the callback.
+        This makes the activity window data more correct than it was.
+
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
 2002-03-27  Chris Blumenberg  <cblu at apple.com>
 
 	Now setting the modifier bit for the activate and cursor events.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 49e325d..6ebdfed 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-03-27  Kenneth Kocienda  <kocienda at apple.com>
+
+        Changed loadProgress->bytesSoFar to use [sender contentLengthReceived]
+        instead of the size of the chunk that was delivered in the callback.
+        This makes the activity window data more correct than it was.
+
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
 2002-03-27  Chris Blumenberg  <cblu at apple.com>
 
 	Now setting the modifier bit for the activate and cursor events.
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index ff59bd4..6711bbc 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -62,7 +62,7 @@
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     [[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
     [loadProgress release];
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index ff59bd4..6711bbc 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -62,7 +62,7 @@
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     [[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
     [loadProgress release];
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index ff59bd4..6711bbc 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -62,7 +62,7 @@
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
     loadProgress->totalToLoad = [sender contentLength];
-    loadProgress->bytesSoFar = [data length];
+    loadProgress->bytesSoFar = [sender contentLengthReceived];
     [[dataSource controller] _mainReceivedProgress: (IFLoadProgress *)loadProgress forResource: [[sender url] absoluteString] fromDataSource: dataSource];
     [loadProgress release];
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list