[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 a989983fa702e19324320a77f2c6289c9e116043
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 17 22:45:24 2002 +0000

        Fixed call to renamed progress method.
    
    	* Plugins.subproj/IFPluginStream.mm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1393 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 92aeb33..13717d4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-17  Richard Williamson  <rjw at apple.com>
+
+    Fixed call to renamed progress method.
+    
+	* Plugins.subproj/IFPluginStream.mm:
+    
 2002-06-17  Chris Blumenberg  <cblu at apple.com>
 
 	* WebView.subproj/IFWebDataSource.h:
@@ -5,11 +11,9 @@
 	(-[IFWebDataSource contentType]): no changes
 	(-[IFWebDataSource fileType]): added. Returns extension based on MIME.
 
+>>>>>>> 1.387
 2002-06-17  Richard Williamson  <rjw at apple.com>
 
-    Fixed www.2cpu.com regression.  QWidget::_displayRect was displaying the wrong view.
-    This was a regression that would impact all DHTML.
-
     Added explicit complete check for resources, rather
     than depend on bytesSoFar == totalToLoad.
     
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 92aeb33..13717d4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-17  Richard Williamson  <rjw at apple.com>
+
+    Fixed call to renamed progress method.
+    
+	* Plugins.subproj/IFPluginStream.mm:
+    
 2002-06-17  Chris Blumenberg  <cblu at apple.com>
 
 	* WebView.subproj/IFWebDataSource.h:
@@ -5,11 +11,9 @@
 	(-[IFWebDataSource contentType]): no changes
 	(-[IFWebDataSource fileType]): added. Returns extension based on MIME.
 
+>>>>>>> 1.387
 2002-06-17  Richard Williamson  <rjw at apple.com>
 
-    Fixed www.2cpu.com regression.  QWidget::_displayRect was displaying the wrong view.
-    This was a regression that would impact all DHTML.
-
     Added explicit complete check for resources, rather
     than depend on bytesSoFar == totalToLoad.
     
diff --git a/WebKit/Plugins.subproj/IFPluginStream.mm b/WebKit/Plugins.subproj/IFPluginStream.mm
index 4c58a4b..52a985d 100644
--- a/WebKit/Plugins.subproj/IFPluginStream.mm
+++ b/WebKit/Plugins.subproj/IFPluginStream.mm
@@ -136,7 +136,7 @@ static NSString *getCarbonPath(NSString *posixPath);
     }
      
     [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle: sender fromDataSource: [view webDataSource]];
+        forResourceHandle: sender fromDataSource: [view webDataSource] complete: NO];
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -167,7 +167,7 @@ static NSString *getCarbonPath(NSString *posixPath);
     }
     
     [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle: sender fromDataSource: [view webDataSource]];
+        forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
     
     [self stop];
     [[view webController] _didStopLoading:URL];
@@ -176,7 +176,7 @@ static NSString *getCarbonPath(NSString *posixPath);
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
     [[view webController] _receivedProgress:[IFLoadProgress progress]
-        forResourceHandle: sender fromDataSource: [view webDataSource]];
+        forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
     
     [self stop];
     [[view webController] _didStopLoading:URL];
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 4c58a4b..52a985d 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -136,7 +136,7 @@ static NSString *getCarbonPath(NSString *posixPath);
     }
      
     [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle: sender fromDataSource: [view webDataSource]];
+        forResourceHandle: sender fromDataSource: [view webDataSource] complete: NO];
 }
 
 - (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)sender data: (NSData *)data
@@ -167,7 +167,7 @@ static NSString *getCarbonPath(NSString *posixPath);
     }
     
     [[view webController] _receivedProgress:[IFLoadProgress progressWithURLHandle:sender]
-        forResourceHandle: sender fromDataSource: [view webDataSource]];
+        forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
     
     [self stop];
     [[view webController] _didStopLoading:URL];
@@ -176,7 +176,7 @@ static NSString *getCarbonPath(NSString *posixPath);
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
     [[view webController] _receivedProgress:[IFLoadProgress progress]
-        forResourceHandle: sender fromDataSource: [view webDataSource]];
+        forResourceHandle: sender fromDataSource: [view webDataSource] complete: YES];
     
     [self stop];
     [[view webController] _didStopLoading:URL];

-- 
WebKit Debian packaging