[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 1dfa39a0db3dd570c0cc68a0d03c22f879857f00
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 23 01:08:25 2002 +0000

    WebFoundation:
            * Misc.subproj/IFError.h:
            * Misc.subproj/IFError.m:
            (+[IFError initialize]):
    
            Removed old WebKit errors, added IFCantShowMIMEType.
    
    WebKit:
            * WebView.subproj/IFMainURLHandleClient.mm:
            (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
    
            Send an IFError when we're asked to show content we can't handle.
    
            * WebView.subproj/IFWebDataSourcePrivate.mm:
    
            Cleaning
    
    WebBrowser:
            * LocationChangeHandler.m:
            (-[LocationChangeHandler requestContentPolicyForMIMEType:]):
    
            Cleaned this up a little.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1062 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b6116fb..7573f43 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-04-22  Chris Blumenberg  <cblu at apple.com>
 
+	* WebView.subproj/IFMainURLHandleClient.mm:
+	(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+	Send an IFError when we're asked to show content we can't handle.
+
+	* WebView.subproj/IFWebDataSourcePrivate.mm:
+
+	Cleaning
+
+2002-04-22  Chris Blumenberg  <cblu at apple.com>
+
 	* WebKit.pbproj/project.pbxproj:
 	* WebView.subproj/IFBaseWebController.mm:
 	(-[IFBaseWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b6116fb..7573f43 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>
 
+	* WebView.subproj/IFMainURLHandleClient.mm:
+	(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+	Send an IFError when we're asked to show content we can't handle.
+
+	* WebView.subproj/IFWebDataSourcePrivate.mm:
+
+	Cleaning
+
+2002-04-22  Chris Blumenberg  <cblu at apple.com>
+
 	* WebKit.pbproj/project.pbxproj:
 	* WebView.subproj/IFBaseWebController.mm:
 	(-[IFBaseWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 35c884f..0af69b7 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -144,7 +144,7 @@
     
         else if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
             // can't show a type that we don't handle
-            [[dataSource _locationChangeHandler] unableToImplementContentPolicy:0];
+            [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType]];
         }
     }
     
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
index 92921ad..add5eeb 100644
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
@@ -302,13 +302,13 @@
         nextFrame = [frames objectAtIndex: i];
         childDataSource = [nextFrame dataSource];
         dataSource = [childDataSource _recursiveDataSourceForLocationChangeHandler:handler];
-        if(dataSource){
+        if(dataSource)
+            return dataSource;
+            
+        childProvisionalDataSource = [nextFrame provisionalDataSource];
+        dataSource = [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        if(dataSource)
             return dataSource;
-        }else{
-            childProvisionalDataSource = [nextFrame provisionalDataSource];
-            if(childProvisionalDataSource)
-                return [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
-        }
     }
     return nil;
 }
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 92921ad..add5eeb 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -302,13 +302,13 @@
         nextFrame = [frames objectAtIndex: i];
         childDataSource = [nextFrame dataSource];
         dataSource = [childDataSource _recursiveDataSourceForLocationChangeHandler:handler];
-        if(dataSource){
+        if(dataSource)
+            return dataSource;
+            
+        childProvisionalDataSource = [nextFrame provisionalDataSource];
+        dataSource = [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
+        if(dataSource)
             return dataSource;
-        }else{
-            childProvisionalDataSource = [nextFrame provisionalDataSource];
-            if(childProvisionalDataSource)
-                return [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
-        }
     }
     return nil;
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 35c884f..0af69b7 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -144,7 +144,7 @@
     
         else if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
             // can't show a type that we don't handle
-            [[dataSource _locationChangeHandler] unableToImplementContentPolicy:0];
+            [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType]];
         }
     }
     
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 35c884f..0af69b7 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -144,7 +144,7 @@
     
         else if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
             // can't show a type that we don't handle
-            [[dataSource _locationChangeHandler] unableToImplementContentPolicy:0];
+            [[dataSource _locationChangeHandler] unableToImplementContentPolicy:[IFError errorWithCode:IFCantShowMIMEType]];
         }
     }
     

-- 
WebKit Debian packaging