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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:57:32 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 31c4aedc84a6a56cbf62720e257b6fc2b056e638
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 6 22:37:44 2002 +0000

    WebKit:
    
    	Took URL field out of click policy - open in new window policy
    	will always open the request URL.
    
            * WebView.subproj/WebControllerPolicyDelegate.h:
            * WebView.subproj/WebControllerPolicyDelegate.m:
            (-[WebPolicyPrivate dealloc]):
            (+[WebURLPolicy webPolicyWithURLAction:]):
            (+[WebFileURLPolicy webPolicyWithFileAction:]):
            (+[WebContentPolicy webPolicyWithContentAction:andPath:]):
            * WebView.subproj/WebDefaultPolicyDelegate.m:
            (-[WebDefaultPolicyDelegate clickPolicyForAction:andRequest:inFrame:]):
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
    
    WebBrowser:
    
            Updated for WebKit changes.
    
    	* BrowserWebController.m:
            (-[BrowserWebController clickPolicyForAction:andRequest:inFrame:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2576 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8638253..6f8425b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2002-11-06  Maciej Stachowiak  <mjs at apple.com>
+
+	Took URL field out of click policy - open in new window policy
+	will always open the request URL.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebControllerPolicyDelegate.m:
+        (-[WebPolicyPrivate dealloc]):
+        (+[WebURLPolicy webPolicyWithURLAction:]):
+        (+[WebFileURLPolicy webPolicyWithFileAction:]):
+        (+[WebContentPolicy webPolicyWithContentAction:andPath:]):
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (-[WebDefaultPolicyDelegate clickPolicyForAction:andRequest:inFrame:]):
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+
 2002-11-06  Chris Blumenberg  <cblu at apple.com>
 
 	Support MacBinary I by checking that bytes 99-127 are 0. Also check byte 82 for all formats.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8638253..6f8425b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-11-06  Maciej Stachowiak  <mjs at apple.com>
+
+	Took URL field out of click policy - open in new window policy
+	will always open the request URL.
+	
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebControllerPolicyDelegate.m:
+        (-[WebPolicyPrivate dealloc]):
+        (+[WebURLPolicy webPolicyWithURLAction:]):
+        (+[WebFileURLPolicy webPolicyWithFileAction:]):
+        (+[WebContentPolicy webPolicyWithContentAction:andPath:]):
+        * WebView.subproj/WebDefaultPolicyDelegate.m:
+        (-[WebDefaultPolicyDelegate clickPolicyForAction:andRequest:inFrame:]):
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+
 2002-11-06  Chris Blumenberg  <cblu at apple.com>
 
 	Support MacBinary I by checking that bytes 99-127 are 0. Also check byte 82 for all formats.
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 4e01b6c..a676070 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -144,11 +144,6 @@ typedef enum {
 */
 - (NSString *)path;
 
-/*!
-    @method URL
-    @abstract The URL of the WebPolicy.
-*/
-- (NSURL *)URL;
 @end
 
 
@@ -205,11 +200,10 @@ typedef enum {
     @method webPolicyWithClickAction:andPath:
     @abstract WebClickPolicy constructor
     @param action The policy action of the WebClickPolicy.
-    @param URL
     @param thePath Path to where the file should be saved. Only applicable for
     WebClickPolicySave and WebClickPolicySaveAndOpenExternally WebClickActions.
 */
-+ webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
 @end
 
 
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.m b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
index 26dd83f..1ab1115 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
@@ -16,7 +16,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 @public
     WebPolicyAction policyAction;
     NSString *path;
-    NSURL *URL;
 }
 @end
 
@@ -25,7 +24,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 - (void)dealloc
 {
     [path release];
-    [URL release];
     [super dealloc];
 }
 
@@ -33,13 +31,12 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 @implementation WebPolicy
 
-- initWithPolicyAction: (WebPolicyAction)action URL:(NSURL *)URL andPath:(NSString *)path;
+- initWithPolicyAction: (WebPolicyAction)action andPath:(NSString *)path;
 {
     [super init];
     _private = [[WebPolicyPrivate alloc] init];
     _private->policyAction = action;
     _private->path = [path copy];
-    _private->URL = [URL retain];
     return self;
 }
 
@@ -58,11 +55,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
     return _private->path;
 }
 
-- (NSURL *)URL
-{
-    return _private->URL;
-}
-
 - (void)_setPath:(NSString *)path
 {
     NSString *copy = [path copy];
@@ -83,7 +75,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 + webPolicyWithURLAction: (WebURLAction)action
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:nil andPath:nil] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
 }
 
 @end
@@ -92,7 +84,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 + webPolicyWithFileAction: (WebFileAction)action
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:nil andPath:nil] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
 }
 
 @end
@@ -101,7 +93,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 + webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:nil andPath:thePath] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
 }
 
 
@@ -109,9 +101,9 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 @implementation WebClickPolicy
 
-+ webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:URL andPath:thePath] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index a4b5bb8..f332957 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -76,7 +76,7 @@
 			      andRequest:(WebResourceRequest *)request
 				 inFrame:(WebFrame *)frame
 {
-    return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow URL:nil andPath:nil];
+    return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow andPath:nil];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index a2c0ce0..7c3d2c0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -821,7 +821,6 @@ static const char * const stateNames[] = {
 					       inFrame:self];
 
     WebPolicyAction clickAction = [clickPolicy policyAction];
-    NSURL *URL = [clickPolicy URL];
 
     switch (clickAction) {
     case WebClickPolicyShow:
@@ -832,14 +831,14 @@ static const char * const stateNames[] = {
 	}
 	break;
     case WebClickPolicyOpenNewWindow:
-	[controller _openNewWindowWithURL:URL referrer:[[self _bridge] referrer] behind:NO];
+	[controller _openNewWindowWithURL:[request URL] referrer:[[self _bridge] referrer] behind:NO];
 	break;
     case WebClickPolicyOpenNewWindowBehind:
-	[controller _openNewWindowWithURL:URL referrer:[[self _bridge] referrer] behind:YES];
+	[controller _openNewWindowWithURL:[request URL] referrer:[[self _bridge] referrer] behind:YES];
 	break;
     case WebClickPolicySave:
     case WebClickPolicySaveAndOpenExternally:
-	[controller _downloadURL:URL
+	[controller _downloadURL:[request URL]
 		    withContentPolicy:[WebContentPolicy webPolicyWithContentAction:clickAction andPath:nil]];
 	break;
     case WebClickPolicyIgnore:
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 4e01b6c..a676070 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -144,11 +144,6 @@ typedef enum {
 */
 - (NSString *)path;
 
-/*!
-    @method URL
-    @abstract The URL of the WebPolicy.
-*/
-- (NSURL *)URL;
 @end
 
 
@@ -205,11 +200,10 @@ typedef enum {
     @method webPolicyWithClickAction:andPath:
     @abstract WebClickPolicy constructor
     @param action The policy action of the WebClickPolicy.
-    @param URL
     @param thePath Path to where the file should be saved. Only applicable for
     WebClickPolicySave and WebClickPolicySaveAndOpenExternally WebClickActions.
 */
-+ webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
 @end
 
 
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.m b/WebKit/WebView.subproj/WebPolicyDelegate.m
index 26dd83f..1ab1115 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.m
@@ -16,7 +16,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 @public
     WebPolicyAction policyAction;
     NSString *path;
-    NSURL *URL;
 }
 @end
 
@@ -25,7 +24,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 - (void)dealloc
 {
     [path release];
-    [URL release];
     [super dealloc];
 }
 
@@ -33,13 +31,12 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 @implementation WebPolicy
 
-- initWithPolicyAction: (WebPolicyAction)action URL:(NSURL *)URL andPath:(NSString *)path;
+- initWithPolicyAction: (WebPolicyAction)action andPath:(NSString *)path;
 {
     [super init];
     _private = [[WebPolicyPrivate alloc] init];
     _private->policyAction = action;
     _private->path = [path copy];
-    _private->URL = [URL retain];
     return self;
 }
 
@@ -58,11 +55,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
     return _private->path;
 }
 
-- (NSURL *)URL
-{
-    return _private->URL;
-}
-
 - (void)_setPath:(NSString *)path
 {
     NSString *copy = [path copy];
@@ -83,7 +75,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 + webPolicyWithURLAction: (WebURLAction)action
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:nil andPath:nil] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
 }
 
 @end
@@ -92,7 +84,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 + webPolicyWithFileAction: (WebFileAction)action
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:nil andPath:nil] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
 }
 
 @end
@@ -101,7 +93,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 + webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:nil andPath:thePath] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
 }
 
 
@@ -109,9 +101,9 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
 
 @implementation WebClickPolicy
 
-+ webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
 {
-    return [[[WebPolicy alloc] initWithPolicyAction:action URL:URL andPath:thePath] autorelease];
+    return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
 }
 
 @end

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list