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

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:08:12 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 8e3285377ebe46a9e2505a9c3467d1910a82aa34
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 19 16:57:57 2002 +0000

            Updated comments to reflect new API.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1052 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 767beb5..3d7b12b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-19  Richard Williamson  <rjw at apple.com>
+
+        Updated comments to reflect new API.
+        
+	* WebView.subproj/IFLocationChangeHandler.h:
+
 2002-04-19  Darin Adler  <darin at apple.com>
 
 	* Plugins.subproj/IFPluginView.h: Re-add the attributes and values arrays,
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 767beb5..3d7b12b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-04-19  Richard Williamson  <rjw at apple.com>
+
+        Updated comments to reflect new API.
+        
+	* WebView.subproj/IFLocationChangeHandler.h:
+
 2002-04-19  Darin Adler  <darin at apple.com>
 
 	* Plugins.subproj/IFPluginView.h: Re-add the attributes and values arrays,
diff --git a/WebKit/WebView.subproj/IFLocationChangeHandler.h b/WebKit/WebView.subproj/IFLocationChangeHandler.h
index 12804be..417466f 100644
--- a/WebKit/WebView.subproj/IFLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/IFLocationChangeHandler.h
@@ -15,28 +15,22 @@
    ============================================================================= 
    
     IFLocationChangeHandlers track changes to a frames location.  This includes 
-    a change that may result in a download rather than a change to the frame
-    document.
+    changes that may result in a download, or a resource being opened externally.
+    rather than a change to the frame document.
     
-    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:
+    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
     method.
     
-    Handlers may veto a change by return NO from
-    
-        - (BOOL)locationWillChangeTo: (NSURL *)url;
-
     A location change that results in changing a frame's document will trigger the
     following messages, sent in order:
    
         - (void)locationChangeStarted;
-        - (void)locationChangeCommitted;
+        - (void)requestContentPolicyForMIMEType: (NSString *)type;
+        - (void)locationChangeCommitted;  // Only sent for the IFContentPolicyShow policy.
         - (void)locationChangeDone: (IFError *)error;
-
-    A location change that results in a download will trigger the following messages,
-    sent in order:
-    
-        - (void)locationChangeStarted;
-        - (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
+   
+   None of the IFLocationChangeHandler methods should block for any extended period
+   of time.
    
    ============================================================================= 
 */
@@ -59,6 +53,11 @@ typedef enum {
 
 - (void)locationChangeStarted;
 
+// Sent after locationChangeStarted.
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
+- (void)requestContentPolicyForMIMEType: (NSString *)type;
+
 - (void)locationChangeCommitted;
 
 - (void)locationChangeDone: (IFError *)error;
@@ -67,13 +66,7 @@ typedef enum {
 
 - (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
 
-// Sent once the IFContentType of the location handler
-// has been determined.  Should not block.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: immediately, although
-// may call it later after showing a user dialog.
-- (void)requestContentPolicyForMIMEType: (NSString *)type;
-
-// We may have different errors that cause the the policy to be un-implementable, i.e.
+// Sent when errors are encountered with an un-implementable policy, i.e.
 // file i/o failure, launch services failure, type mismatches, etc.
 - (void)unableToImplementContentPolicy: (IFError *)error;
 
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 12804be..417466f 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -15,28 +15,22 @@
    ============================================================================= 
    
     IFLocationChangeHandlers track changes to a frames location.  This includes 
-    a change that may result in a download rather than a change to the frame
-    document.
+    changes that may result in a download, or a resource being opened externally.
+    rather than a change to the frame document.
     
-    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:
+    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
     method.
     
-    Handlers may veto a change by return NO from
-    
-        - (BOOL)locationWillChangeTo: (NSURL *)url;
-
     A location change that results in changing a frame's document will trigger the
     following messages, sent in order:
    
         - (void)locationChangeStarted;
-        - (void)locationChangeCommitted;
+        - (void)requestContentPolicyForMIMEType: (NSString *)type;
+        - (void)locationChangeCommitted;  // Only sent for the IFContentPolicyShow policy.
         - (void)locationChangeDone: (IFError *)error;
-
-    A location change that results in a download will trigger the following messages,
-    sent in order:
-    
-        - (void)locationChangeStarted;
-        - (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
+   
+   None of the IFLocationChangeHandler methods should block for any extended period
+   of time.
    
    ============================================================================= 
 */
@@ -59,6 +53,11 @@ typedef enum {
 
 - (void)locationChangeStarted;
 
+// Sent after locationChangeStarted.
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
+- (void)requestContentPolicyForMIMEType: (NSString *)type;
+
 - (void)locationChangeCommitted;
 
 - (void)locationChangeDone: (IFError *)error;
@@ -67,13 +66,7 @@ typedef enum {
 
 - (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
 
-// Sent once the IFContentType of the location handler
-// has been determined.  Should not block.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: immediately, although
-// may call it later after showing a user dialog.
-- (void)requestContentPolicyForMIMEType: (NSString *)type;
-
-// We may have different errors that cause the the policy to be un-implementable, i.e.
+// Sent when errors are encountered with an un-implementable policy, i.e.
 // file i/o failure, launch services failure, type mismatches, etc.
 - (void)unableToImplementContentPolicy: (IFError *)error;
 
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 12804be..417466f 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -15,28 +15,22 @@
    ============================================================================= 
    
     IFLocationChangeHandlers track changes to a frames location.  This includes 
-    a change that may result in a download rather than a change to the frame
-    document.
+    changes that may result in a download, or a resource being opened externally.
+    rather than a change to the frame document.
     
-    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:
+    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
     method.
     
-    Handlers may veto a change by return NO from
-    
-        - (BOOL)locationWillChangeTo: (NSURL *)url;
-
     A location change that results in changing a frame's document will trigger the
     following messages, sent in order:
    
         - (void)locationChangeStarted;
-        - (void)locationChangeCommitted;
+        - (void)requestContentPolicyForMIMEType: (NSString *)type;
+        - (void)locationChangeCommitted;  // Only sent for the IFContentPolicyShow policy.
         - (void)locationChangeDone: (IFError *)error;
-
-    A location change that results in a download will trigger the following messages,
-    sent in order:
-    
-        - (void)locationChangeStarted;
-        - (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
+   
+   None of the IFLocationChangeHandler methods should block for any extended period
+   of time.
    
    ============================================================================= 
 */
@@ -59,6 +53,11 @@ typedef enum {
 
 - (void)locationChangeStarted;
 
+// Sent after locationChangeStarted.
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
+- (void)requestContentPolicyForMIMEType: (NSString *)type;
+
 - (void)locationChangeCommitted;
 
 - (void)locationChangeDone: (IFError *)error;
@@ -67,13 +66,7 @@ typedef enum {
 
 - (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
 
-// Sent once the IFContentType of the location handler
-// has been determined.  Should not block.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: immediately, although
-// may call it later after showing a user dialog.
-- (void)requestContentPolicyForMIMEType: (NSString *)type;
-
-// We may have different errors that cause the the policy to be un-implementable, i.e.
+// Sent when errors are encountered with an un-implementable policy, i.e.
 // file i/o failure, launch services failure, type mismatches, etc.
 - (void)unableToImplementContentPolicy: (IFError *)error;
 
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
index 12804be..417466f 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.h
@@ -15,28 +15,22 @@
    ============================================================================= 
    
     IFLocationChangeHandlers track changes to a frames location.  This includes 
-    a change that may result in a download rather than a change to the frame
-    document.
+    changes that may result in a download, or a resource being opened externally.
+    rather than a change to the frame document.
     
-    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:
+    Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
     method.
     
-    Handlers may veto a change by return NO from
-    
-        - (BOOL)locationWillChangeTo: (NSURL *)url;
-
     A location change that results in changing a frame's document will trigger the
     following messages, sent in order:
    
         - (void)locationChangeStarted;
-        - (void)locationChangeCommitted;
+        - (void)requestContentPolicyForMIMEType: (NSString *)type;
+        - (void)locationChangeCommitted;  // Only sent for the IFContentPolicyShow policy.
         - (void)locationChangeDone: (IFError *)error;
-
-    A location change that results in a download will trigger the following messages,
-    sent in order:
-    
-        - (void)locationChangeStarted;
-        - (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
+   
+   None of the IFLocationChangeHandler methods should block for any extended period
+   of time.
    
    ============================================================================= 
 */
@@ -59,6 +53,11 @@ typedef enum {
 
 - (void)locationChangeStarted;
 
+// Sent after locationChangeStarted.
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
+- (void)requestContentPolicyForMIMEType: (NSString *)type;
+
 - (void)locationChangeCommitted;
 
 - (void)locationChangeDone: (IFError *)error;
@@ -67,13 +66,7 @@ typedef enum {
 
 - (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
 
-// Sent once the IFContentType of the location handler
-// has been determined.  Should not block.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: immediately, although
-// may call it later after showing a user dialog.
-- (void)requestContentPolicyForMIMEType: (NSString *)type;
-
-// We may have different errors that cause the the policy to be un-implementable, i.e.
+// Sent when errors are encountered with an un-implementable policy, i.e.
 // file i/o failure, launch services failure, type mismatches, etc.
 - (void)unableToImplementContentPolicy: (IFError *)error;
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list