[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 5ae52af9f0dea5aa4497ee9b7df4a53ce811e96f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 23 00:09:05 2002 +0000

    WebBrowser:
            * LocationChangeHandler.m:
            (-[LocationChangeHandler requestContentPolicyForMIMEType:]):
    
            A nil type means that this is a file URL.
    
    WebKit:
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/IFBaseWebController.mm:
            (-[IFBaseWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
            * WebView.subproj/IFWebDataSourcePrivate.h:
            * WebView.subproj/IFWebDataSourcePrivate.mm:
    
            Fixed frames which I broke in the previous commit. We now set the content policy
            on all child frames instead of just the main frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1f53267..b6116fb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-04-22  Chris Blumenberg  <cblu at apple.com>
 
+	* WebKit.pbproj/project.pbxproj:
+	* WebView.subproj/IFBaseWebController.mm:
+	(-[IFBaseWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
+	* WebView.subproj/IFWebDataSourcePrivate.h:
+	* WebView.subproj/IFWebDataSourcePrivate.mm:
+
+	Fixed frames which I broke in the previous commit. We now set the content policy
+	on all child frames instead of just the main frame.	
+
+2002-04-22  Chris Blumenberg  <cblu at apple.com>
+
 	* MIME.subproj/IFMIMEHandler.h:
 	* MIME.subproj/IFMIMEHandler.m:
 	(+[IFMIMEHandler showableMIMETypes]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1f53267..b6116fb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-04-22  Chris Blumenberg  <cblu at apple.com>
 
+	* WebKit.pbproj/project.pbxproj:
+	* WebView.subproj/IFBaseWebController.mm:
+	(-[IFBaseWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
+	* WebView.subproj/IFWebDataSourcePrivate.h:
+	* WebView.subproj/IFWebDataSourcePrivate.mm:
+
+	Fixed frames which I broke in the previous commit. We now set the content policy
+	on all child frames instead of just the main frame.	
+
+2002-04-22  Chris Blumenberg  <cblu at apple.com>
+
 	* MIME.subproj/IFMIMEHandler.h:
 	* MIME.subproj/IFMIMEHandler.m:
 	(+[IFMIMEHandler showableMIMETypes]):
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index caa76cc..56a5b3e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 36;
+	objectVersion = 38;
 	objects = {
 		014CEA440018CDF011CA2923 = {
 			buildRules = (
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index ff1af3c..22a655b 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -256,10 +256,16 @@
 
 - (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forLocationChangeHandler: (id <IFLocationChangeHandler>)handler
 {
-    IFWebDataSource *dataSource;
+    IFWebDataSource *mainDataSource, *mainProvisionalDataSource, *dataSource;
     
-    dataSource = [_private->mainFrame provisionalDataSource];
-    if([dataSource _locationChangeHandler] == handler){
+    mainProvisionalDataSource = [_private->mainFrame provisionalDataSource];
+    mainDataSource = [_private->mainFrame dataSource];
+    
+    dataSource = [mainDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+    if(!dataSource)
+        dataSource = [mainProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        
+    if(dataSource){
         [dataSource _setContentPolicy:policy];
         [dataSource _setDownloadPath:path];
     }
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 4ac09fe..82e38e6 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -88,4 +88,5 @@ class KHTMLPart;
 - (void) _setDownloadPath:(NSString *)path;
 - (IFContentPolicy) _contentPolicy;
 - (void) _setContentPolicy:(IFContentPolicy)policy;
+- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
 @end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index dbf1f60..92921ad 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -287,4 +287,30 @@
     _private->contentPolicy = policy;
 }
 
+- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
+{
+    IFWebDataSource *childProvisionalDataSource, *childDataSource, *dataSource;
+    IFWebFrame *nextFrame;
+    NSArray *frames;
+    uint i;
+        
+    if(_private->locationChangeHandler == handler)
+        return self;
+    
+    frames = [self children];
+    for (i = 0; i < [frames count]; i++){
+        nextFrame = [frames objectAtIndex: i];
+        childDataSource = [nextFrame dataSource];
+        dataSource = [childDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        if(dataSource){
+            return dataSource;
+        }else{
+            childProvisionalDataSource = [nextFrame provisionalDataSource];
+            if(childProvisionalDataSource)
+                return [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        }
+    }
+    return nil;
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 4ac09fe..82e38e6 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -88,4 +88,5 @@ class KHTMLPart;
 - (void) _setDownloadPath:(NSString *)path;
 - (IFContentPolicy) _contentPolicy;
 - (void) _setContentPolicy:(IFContentPolicy)policy;
+- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index dbf1f60..92921ad 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -287,4 +287,30 @@
     _private->contentPolicy = policy;
 }
 
+- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
+{
+    IFWebDataSource *childProvisionalDataSource, *childDataSource, *dataSource;
+    IFWebFrame *nextFrame;
+    NSArray *frames;
+    uint i;
+        
+    if(_private->locationChangeHandler == handler)
+        return self;
+    
+    frames = [self children];
+    for (i = 0; i < [frames count]; i++){
+        nextFrame = [frames objectAtIndex: i];
+        childDataSource = [nextFrame dataSource];
+        dataSource = [childDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        if(dataSource){
+            return dataSource;
+        }else{
+            childProvisionalDataSource = [nextFrame provisionalDataSource];
+            if(childProvisionalDataSource)
+                return [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        }
+    }
+    return nil;
+}
+
 @end

-- 
WebKit Debian packaging