[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 96caa83adc44860d9421db90305ae1e25d78987b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 31 01:48:02 2002 +0000

        API and comment cleanup.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ccc874d..84bbdf4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-30  Richard Williamson  <rjw at apple.com>
+
+    API and comment cleanup.
+    
+	* WebView.subproj/IFWebFrame.h:
+	* WebView.subproj/IFWebFrame.mm:
+	(-[IFWebFrame setProvisionalDataSource:]):
+
 2002-05-30  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit parts of fixes for:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ccc874d..84bbdf4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-05-30  Richard Williamson  <rjw at apple.com>
+
+    API and comment cleanup.
+    
+	* WebView.subproj/IFWebFrame.h:
+	* WebView.subproj/IFWebFrame.mm:
+	(-[IFWebFrame setProvisionalDataSource:]):
+
 2002-05-30  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit parts of fixes for:
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 98500d8..a141d57 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -35,7 +35,7 @@
     ~some~ data has been received.
     
     Will return NO and not set the provisional data source if the controller
-    disallows by return NO locationWillChangeTo:forFrame:.
+    disallows by returning a IFURLPolicyIgnore.
 */
 - (BOOL)setProvisionalDataSource: (IFWebDataSource *)ds;
 
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index a4e0cfe..d27eb33 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -111,8 +111,8 @@
 }
 
 
-// FIXME:  The name of this method is a little misleading, perhaps
-// we could call it prepareProvisionalDataSource?.
+//    Will return NO and not set the provisional data source if the controller
+//    disallows by returning a IFURLPolicyIgnore.
 - (BOOL)setProvisionalDataSource: (IFWebDataSource *)newDataSource
 {
     IFWebDataSource *oldDataSource;
@@ -164,13 +164,12 @@
     
         [self _setState: IFWEBFRAMESTATE_PROVISIONAL];
     }
-    
     else if(urlPolicy == IFURLPolicyOpenExternally){
         return [[NSWorkspace sharedWorkspace] openURL:[newDataSource inputURL]];
     }
-    
-    // Do nothing in the IFURLPolicyIgnore case.
-
+    else if (urlPolicy == IFURLPolicyIgnore)
+        return NO;
+        
     return YES;
 }
 
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 98500d8..a141d57 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -35,7 +35,7 @@
     ~some~ data has been received.
     
     Will return NO and not set the provisional data source if the controller
-    disallows by return NO locationWillChangeTo:forFrame:.
+    disallows by returning a IFURLPolicyIgnore.
 */
 - (BOOL)setProvisionalDataSource: (IFWebDataSource *)ds;
 
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index a4e0cfe..d27eb33 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -111,8 +111,8 @@
 }
 
 
-// FIXME:  The name of this method is a little misleading, perhaps
-// we could call it prepareProvisionalDataSource?.
+//    Will return NO and not set the provisional data source if the controller
+//    disallows by returning a IFURLPolicyIgnore.
 - (BOOL)setProvisionalDataSource: (IFWebDataSource *)newDataSource
 {
     IFWebDataSource *oldDataSource;
@@ -164,13 +164,12 @@
     
         [self _setState: IFWEBFRAMESTATE_PROVISIONAL];
     }
-    
     else if(urlPolicy == IFURLPolicyOpenExternally){
         return [[NSWorkspace sharedWorkspace] openURL:[newDataSource inputURL]];
     }
-    
-    // Do nothing in the IFURLPolicyIgnore case.
-
+    else if (urlPolicy == IFURLPolicyIgnore)
+        return NO;
+        
     return YES;
 }
 

-- 
WebKit Debian packaging