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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 911598ab0417403eff1138e9f9452d4d2ab44bbe
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 26 01:14:13 2002 +0000

    	Fixed crasher caused by not retaining the content policy.
    
            * WebView.subproj/WebControllerPolicyHandler.h:
            * WebView.subproj/WebMainResourceClient.h:
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient WebResourceHandle:dataDidBecomeAvailable:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 72b0b44..f1f20ff 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-07-25  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed crasher caused by not retaining the content policy.
+
+        * WebView.subproj/WebControllerPolicyHandler.h:
+        * WebView.subproj/WebMainResourceClient.h:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient WebResourceHandle:dataDidBecomeAvailable:]):
+
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
 	Made policy APIs return a WebPolicy object.
 	Added click policy.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 72b0b44..f1f20ff 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-07-25  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed crasher caused by not retaining the content policy.
+
+        * WebView.subproj/WebControllerPolicyHandler.h:
+        * WebView.subproj/WebMainResourceClient.h:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient WebResourceHandle:dataDidBecomeAvailable:]):
+
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
 	Made policy APIs return a WebPolicy object.
 	Added click policy.
 
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 64ec1fa..30aa7d1 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -34,19 +34,19 @@ typedef enum {
 } WebFileAction;
 
 typedef enum {
-    WebContentPolicyNone,
-    WebContentPolicyShow,
-    WebContentPolicySave,
-    WebContentPolicySaveAndOpenExternally,
-    WebContentPolicyIgnore
+    WebContentPolicyNone = WebPolicyNone,
+    WebContentPolicyShow = WebPolicyUse,
+    WebContentPolicySave = WebPolicySave,
+    WebContentPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
+    WebContentPolicyIgnore = WebPolicyIgnore
 } WebContentAction;
 
 typedef enum {
     WebClickPolicyNone = WebPolicyNone,
-    WebClickPolicyShow,
-    WebClickPolicySave,
-    WebClickPolicySaveAndOpenExternally,
-    WebClickPolicyIgnore
+    WebClickPolicyShow = WebPolicyUse,
+    WebClickPolicySave = WebPolicySave,
+    WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
+    WebClickPolicyIgnore = WebPolicyIgnore
 } WebClickAction;
 
 @interface WebPolicy : NSObject
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.h b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
index 64ec1fa..30aa7d1 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
@@ -34,19 +34,19 @@ typedef enum {
 } WebFileAction;
 
 typedef enum {
-    WebContentPolicyNone,
-    WebContentPolicyShow,
-    WebContentPolicySave,
-    WebContentPolicySaveAndOpenExternally,
-    WebContentPolicyIgnore
+    WebContentPolicyNone = WebPolicyNone,
+    WebContentPolicyShow = WebPolicyUse,
+    WebContentPolicySave = WebPolicySave,
+    WebContentPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
+    WebContentPolicyIgnore = WebPolicyIgnore
 } WebContentAction;
 
 typedef enum {
     WebClickPolicyNone = WebPolicyNone,
-    WebClickPolicyShow,
-    WebClickPolicySave,
-    WebClickPolicySaveAndOpenExternally,
-    WebClickPolicyIgnore
+    WebClickPolicyShow = WebPolicyUse,
+    WebClickPolicySave = WebPolicySave,
+    WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
+    WebClickPolicyIgnore = WebPolicyIgnore
 } WebClickAction;
 
 @interface WebPolicy : NSObject
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 911db59..e33ffdd 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <WebKit/WebControllerPolicyHandler.h>
+
 @class WebDownloadHandler;
 @class WebDataSource;
 @protocol WebResourceClient;
@@ -17,10 +19,10 @@
 {
     NSURL *currentURL;
     WebDataSource *dataSource;
-    BOOL processedBufferedData;
     BOOL isFirstChunk;
     WebDownloadHandler *downloadHandler;
     id <WebResourceProgressHandler> downloadProgressHandler;
+    WebContentAction policyAction;
 }
 - initWithDataSource:(WebDataSource *)dataSource;
 - (WebDownloadHandler *)downloadHandler;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 376fef5..49fad68 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -9,7 +9,6 @@
 #import <WebKit/WebLocationChangeHandler.h>
 #import <WebKit/WebMainResourceClient.h>
 #import <WebKit/WebController.h>
-#import <WebKit/WebControllerPolicyHandler.h>
 #import <WebKit/WebControllerPrivate.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDataSourcePrivate.h>
@@ -191,13 +190,14 @@
 
         if([[dataSource contentPolicy] policyAction] == WebContentPolicyNone){
             contentPolicy = [[controller policyHandler] contentPolicyForMIMEType: contentType dataSource: dataSource];
+            policyAction = [contentPolicy policyAction];
             [dataSource _setContentPolicy:contentPolicy];
         }
         
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
     }
 
-    switch ([contentPolicy policyAction]) {
+    switch (policyAction) {
     case WebContentPolicyShow:
         [dataSource _receivedData:data];
         break;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 911db59..e33ffdd 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <WebKit/WebControllerPolicyHandler.h>
+
 @class WebDownloadHandler;
 @class WebDataSource;
 @protocol WebResourceClient;
@@ -17,10 +19,10 @@
 {
     NSURL *currentURL;
     WebDataSource *dataSource;
-    BOOL processedBufferedData;
     BOOL isFirstChunk;
     WebDownloadHandler *downloadHandler;
     id <WebResourceProgressHandler> downloadProgressHandler;
+    WebContentAction policyAction;
 }
 - initWithDataSource:(WebDataSource *)dataSource;
 - (WebDownloadHandler *)downloadHandler;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 376fef5..49fad68 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -9,7 +9,6 @@
 #import <WebKit/WebLocationChangeHandler.h>
 #import <WebKit/WebMainResourceClient.h>
 #import <WebKit/WebController.h>
-#import <WebKit/WebControllerPolicyHandler.h>
 #import <WebKit/WebControllerPrivate.h>
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDataSourcePrivate.h>
@@ -191,13 +190,14 @@
 
         if([[dataSource contentPolicy] policyAction] == WebContentPolicyNone){
             contentPolicy = [[controller policyHandler] contentPolicyForMIMEType: contentType dataSource: dataSource];
+            policyAction = [contentPolicy policyAction];
             [dataSource _setContentPolicy:contentPolicy];
         }
         
         WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
     }
 
-    switch ([contentPolicy policyAction]) {
+    switch (policyAction) {
     case WebContentPolicyShow:
         [dataSource _receivedData:data];
         break;
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 64ec1fa..30aa7d1 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -34,19 +34,19 @@ typedef enum {
 } WebFileAction;
 
 typedef enum {
-    WebContentPolicyNone,
-    WebContentPolicyShow,
-    WebContentPolicySave,
-    WebContentPolicySaveAndOpenExternally,
-    WebContentPolicyIgnore
+    WebContentPolicyNone = WebPolicyNone,
+    WebContentPolicyShow = WebPolicyUse,
+    WebContentPolicySave = WebPolicySave,
+    WebContentPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
+    WebContentPolicyIgnore = WebPolicyIgnore
 } WebContentAction;
 
 typedef enum {
     WebClickPolicyNone = WebPolicyNone,
-    WebClickPolicyShow,
-    WebClickPolicySave,
-    WebClickPolicySaveAndOpenExternally,
-    WebClickPolicyIgnore
+    WebClickPolicyShow = WebPolicyUse,
+    WebClickPolicySave = WebPolicySave,
+    WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
+    WebClickPolicyIgnore = WebPolicyIgnore
 } WebClickAction;
 
 @interface WebPolicy : NSObject

-- 
WebKit Debian packaging