[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 33f579549ab740e091a33cef4bca30fa8fc450a1
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 17 18:18:32 2002 +0000

        Fixed IFImageViews not drawing correctly.
    
        Changed compeletion to explicity use IFURLHandleResourceDidFinishLoading, rather
        than depend on bytesSoFar == totalToLoad.
    
    	* WebView.subproj/IFMainURLHandleClient.mm:
    	(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
    	(-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
    	(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
    	* WebView.subproj/IFWebControllerPrivate.h:
    	* WebView.subproj/IFWebControllerPrivate.mm:
    	(-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4d9ec21..b1a3d74 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-06-17  Richard Williamson  <rjw at apple.com>
+
+    Fixed IFImageViews not drawing correctly.
+    
+    Changed compeletion to explicity use IFURLHandleResourceDidFinishLoading, rather
+    than depend on bytesSoFar == totalToLoad.
+    
+	* WebView.subproj/IFMainURLHandleClient.mm:
+	(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+	(-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+	(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+	* WebView.subproj/IFWebControllerPrivate.h:
+	* WebView.subproj/IFWebControllerPrivate.mm:
+	(-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+
 2002-06-16  Darin Adler  <darin at apple.com>
 
 	* WebCoreSupport.subproj/IFWebCoreFrame.m: (-[IFWebCoreFrame bridge]): Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4d9ec21..b1a3d74 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-06-17  Richard Williamson  <rjw at apple.com>
+
+    Fixed IFImageViews not drawing correctly.
+    
+    Changed compeletion to explicity use IFURLHandleResourceDidFinishLoading, rather
+    than depend on bytesSoFar == totalToLoad.
+    
+	* WebView.subproj/IFMainURLHandleClient.mm:
+	(-[IFMainURLHandleClient IFURLHandleResourceDidCancelLoading:]):
+	(-[IFMainURLHandleClient IFURLHandleResourceDidFinishLoading:data:]):
+	(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+	* WebView.subproj/IFWebControllerPrivate.h:
+	* WebView.subproj/IFWebControllerPrivate.mm:
+	(-[IFWebController _mainReceivedProgress:forResourceHandle:fromDataSource:complete:]):
+
 2002-06-16  Darin Adler  <darin at apple.com>
 
 	* WebCoreSupport.subproj/IFWebCoreFrame.m: (-[IFWebCoreFrame bridge]): Added.
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 7f4218b..5d9f0cf 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -74,7 +74,7 @@
 #endif    
     
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progress]
-        forResourceHandle:sender fromDataSource: dataSource];
+        forResourceHandle:sender fromDataSource: dataSource complete: YES];
     [[dataSource controller] _didStopLoading:url];
     [url release];
     url = nil;
@@ -97,12 +97,12 @@
        [dataSource _setResourceData:data];
     }
     
-    if(IFContentPolicyShow)
+    if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
     // update progress
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource];
+        forResourceHandle:sender fromDataSource:dataSource complete:YES];
     [[dataSource controller] _didStopLoading:url];
     [url release];
     url = nil;
@@ -181,7 +181,7 @@
     
     // update progress
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource];
+        forResourceHandle:sender fromDataSource:dataSource complete: NO];
     
     isFirstChunk = NO;
 }
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.h b/WebKit/WebView.subproj/IFWebControllerPrivate.h
index c1d198b..9f1465f 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.h
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.h
@@ -20,7 +20,7 @@
 @interface IFWebController (IFPrivate);
 - (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
 - (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_didStartLoading: (NSURL *)url;
 - (void)_didStopLoading: (NSURL *)url;
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index 549cffe..87d7fb5 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -92,7 +92,7 @@
     }
 }
 
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource
+- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
 {
     IFWebFrame *frame = [dataSource webFrame];
     IFContentPolicy contentPolicy = [dataSource contentPolicy];
@@ -112,7 +112,7 @@
 
     [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
 
-    if(progress->bytesSoFar == progress->totalToLoad){
+    if(isComplete){
         if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
             [dataSource _setPrimaryLoadComplete: YES];
     }
@@ -130,7 +130,7 @@
     }
 
     // This resouce has completed, so check if the load is complete for all frames.
-    if (progress->bytesSoFar == progress->totalToLoad){
+    if (isComplete){
         // If the load is complete, mark the primary load as done.  The primary load is the load
         // of the main document.  Other resources may still be arriving.
         [dataSource _setPrimaryLoadComplete: YES];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index c1d198b..9f1465f 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -20,7 +20,7 @@
 @interface IFWebController (IFPrivate);
 - (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
 - (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_didStartLoading: (NSURL *)url;
 - (void)_didStopLoading: (NSURL *)url;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 549cffe..87d7fb5 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -92,7 +92,7 @@
     }
 }
 
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource
+- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
 {
     IFWebFrame *frame = [dataSource webFrame];
     IFContentPolicy contentPolicy = [dataSource contentPolicy];
@@ -112,7 +112,7 @@
 
     [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
 
-    if(progress->bytesSoFar == progress->totalToLoad){
+    if(isComplete){
         if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
             [dataSource _setPrimaryLoadComplete: YES];
     }
@@ -130,7 +130,7 @@
     }
 
     // This resouce has completed, so check if the load is complete for all frames.
-    if (progress->bytesSoFar == progress->totalToLoad){
+    if (isComplete){
         // If the load is complete, mark the primary load as done.  The primary load is the load
         // of the main document.  Other resources may still be arriving.
         [dataSource _setPrimaryLoadComplete: YES];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 7f4218b..5d9f0cf 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -74,7 +74,7 @@
 #endif    
     
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progress]
-        forResourceHandle:sender fromDataSource: dataSource];
+        forResourceHandle:sender fromDataSource: dataSource complete: YES];
     [[dataSource controller] _didStopLoading:url];
     [url release];
     url = nil;
@@ -97,12 +97,12 @@
        [dataSource _setResourceData:data];
     }
     
-    if(IFContentPolicyShow)
+    if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
     // update progress
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource];
+        forResourceHandle:sender fromDataSource:dataSource complete:YES];
     [[dataSource controller] _didStopLoading:url];
     [url release];
     url = nil;
@@ -181,7 +181,7 @@
     
     // update progress
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource];
+        forResourceHandle:sender fromDataSource:dataSource complete: NO];
     
     isFirstChunk = NO;
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 7f4218b..5d9f0cf 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -74,7 +74,7 @@
 #endif    
     
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progress]
-        forResourceHandle:sender fromDataSource: dataSource];
+        forResourceHandle:sender fromDataSource: dataSource complete: YES];
     [[dataSource controller] _didStopLoading:url];
     [url release];
     url = nil;
@@ -97,12 +97,12 @@
        [dataSource _setResourceData:data];
     }
     
-    if(IFContentPolicyShow)
+    if([dataSource contentPolicy] == IFContentPolicyShow)
         [[dataSource representation] finishedLoadingWithDataSource:dataSource];
     
     // update progress
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource];
+        forResourceHandle:sender fromDataSource:dataSource complete:YES];
     [[dataSource controller] _didStopLoading:url];
     [url release];
     url = nil;
@@ -181,7 +181,7 @@
     
     // update progress
     [[dataSource controller] _mainReceivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle:sender fromDataSource:dataSource];
+        forResourceHandle:sender fromDataSource:dataSource complete: NO];
     
     isFirstChunk = NO;
 }
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index c1d198b..9f1465f 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -20,7 +20,7 @@
 @interface IFWebController (IFPrivate);
 - (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource;
+- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
 - (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
 - (void)_didStartLoading: (NSURL *)url;
 - (void)_didStopLoading: (NSURL *)url;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 549cffe..87d7fb5 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -92,7 +92,7 @@
     }
 }
 
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource
+- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
 {
     IFWebFrame *frame = [dataSource webFrame];
     IFContentPolicy contentPolicy = [dataSource contentPolicy];
@@ -112,7 +112,7 @@
 
     [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle fromDataSource: dataSource];
 
-    if(progress->bytesSoFar == progress->totalToLoad){
+    if(isComplete){
         if(contentPolicy == IFContentPolicyOpenExternally || contentPolicy == IFContentPolicySave)
             [dataSource _setPrimaryLoadComplete: YES];
     }
@@ -130,7 +130,7 @@
     }
 
     // This resouce has completed, so check if the load is complete for all frames.
-    if (progress->bytesSoFar == progress->totalToLoad){
+    if (isComplete){
         // If the load is complete, mark the primary load as done.  The primary load is the load
         // of the main document.  Other resources may still be arriving.
         [dataSource _setPrimaryLoadComplete: YES];

-- 
WebKit Debian packaging