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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit f041ae0ca78143fcc70f21c353f676c21d6e2c27
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 20 22:27:16 2002 +0000

            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidReceiveData:data:]):
    	Fixed uninitialized variable that Maciej's deployment build found.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1883 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b33de66..855749c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-08-20  John Sullivan  <sullivan at apple.com>
 
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+	Fixed uninitialized variable that Maciej's deployment build found.
+
+2002-08-20  John Sullivan  <sullivan at apple.com>
+
 	Fixed problem with previous checkin that was causing
 	drag-and-drop for files to fail (at least).
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b33de66..855749c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-08-20  John Sullivan  <sullivan at apple.com>
 
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidReceiveData:data:]):
+	Fixed uninitialized variable that Maciej's deployment build found.
+
+2002-08-20  John Sullivan  <sullivan at apple.com>
+
 	Fixed problem with previous checkin that was causing
 	drag-and-drop for files to fail (at least).
 
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index be0d3e3..52ee251 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -171,7 +171,6 @@
     WebController *controller = [dataSource controller];
     NSString *contentType = [handle contentType];
     WebFrame *frame = [dataSource webFrame];
-    WebContentPolicy *contentPolicy;
     
     WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s, data = %p, length %d\n", DEBUG_OBJECT([handle URL]), data, [data length]);
     
@@ -193,7 +192,8 @@
         // This happens in the cases mentioned in 2981866 and 2965312.
         downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
 
-        if(![dataSource contentPolicy]){
+        WebContentPolicy *contentPolicy = [dataSource contentPolicy];
+        if(contentPolicy == nil){
             contentPolicy = [[controller policyHandler] contentPolicyForMIMEType: contentType URL:currentURL inFrame:frame];
             [dataSource _setContentPolicy:contentPolicy];
         }
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index be0d3e3..52ee251 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -171,7 +171,6 @@
     WebController *controller = [dataSource controller];
     NSString *contentType = [handle contentType];
     WebFrame *frame = [dataSource webFrame];
-    WebContentPolicy *contentPolicy;
     
     WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "URL = %s, data = %p, length %d\n", DEBUG_OBJECT([handle URL]), data, [data length]);
     
@@ -193,7 +192,8 @@
         // This happens in the cases mentioned in 2981866 and 2965312.
         downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
 
-        if(![dataSource contentPolicy]){
+        WebContentPolicy *contentPolicy = [dataSource contentPolicy];
+        if(contentPolicy == nil){
             contentPolicy = [[controller policyHandler] contentPolicyForMIMEType: contentType URL:currentURL inFrame:frame];
             [dataSource _setContentPolicy:contentPolicy];
         }

-- 
WebKit Debian packaging