[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:46:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d1356935746831d347b70f4b20583f0c7d4c6d90
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 2 18:59:02 2002 +0000
WebKit:
More work on "open window behind".
* WebView.subproj/WebControllerPolicyDelegate.h: Add new OpenNewWindowBehind
constants to the enums.
* WebView.subproj/WebWindowOperationsDelegate.h: Add a behind: parameter to
the openNewWindowWithURL method.
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _continueAfterClickPolicyForEvent:]): In the new
WebClickPolicyOpenNewWindowBehind case, pass YES for behind.
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge openNewWindowWithURL:referrer:frameName:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame frameNamed:]):
Pass NO for behind.
WebBrowser:
More work on "open window behind".
* BrowserWebController.m:
(-[BrowserWebController openNewWindowWithURL:referrer:behind:]): Add new behind
parameter to match change to window operations delegate in WebKit.
(-[BrowserWebController clickPolicyForElement:button:modifierFlags:]): Use the
WebClickPolicyOpenNewWindowBehind policy if the shift key and command key are down.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2227 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7ba32d6..65e7387 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,29 @@
2002-10-02 Darin Adler <darin at apple.com>
+ More work on "open window behind".
+
+ * WebView.subproj/WebControllerPolicyDelegate.h: Add new OpenNewWindowBehind
+ constants to the enums.
+
+ * WebView.subproj/WebWindowOperationsDelegate.h: Add a behind: parameter to
+ the openNewWindowWithURL method.
+
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _continueAfterClickPolicyForEvent:]): In the new
+ WebClickPolicyOpenNewWindowBehind case, pass YES for behind.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge openNewWindowWithURL:referrer:frameName:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame frameNamed:]):
+ Pass NO for behind.
+
+2002-10-02 Darin Adler <darin at apple.com>
+
Cut down on unnecessary use of WebFoundation private stuff.
* Plugins.subproj/WebPluginStream.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7ba32d6..65e7387 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,29 @@
2002-10-02 Darin Adler <darin at apple.com>
+ More work on "open window behind".
+
+ * WebView.subproj/WebControllerPolicyDelegate.h: Add new OpenNewWindowBehind
+ constants to the enums.
+
+ * WebView.subproj/WebWindowOperationsDelegate.h: Add a behind: parameter to
+ the openNewWindowWithURL method.
+
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _continueAfterClickPolicyForEvent:]): In the new
+ WebClickPolicyOpenNewWindowBehind case, pass YES for behind.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge openNewWindowWithURL:referrer:frameName:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame frameNamed:]):
+ Pass NO for behind.
+
+2002-10-02 Darin Adler <darin at apple.com>
+
Cut down on unnecessary use of WebFoundation private stuff.
* Plugins.subproj/WebPluginStream.m:
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 30cde17..f8df5ae 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -774,7 +774,7 @@
frame = [[self webFrame] frameNamed:target];
if(!frame){
// FIXME: Why is it OK to just discard all the attributes in this case?
- [[[self controller] windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil];
+ [[[self controller] windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil behind:NO];
// FIXME: Need to send NPP_URLNotify at the right time.
// FIXME: Need to name new frame
if(notifyData){
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 445bc57..7c0ca66 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -70,7 +70,7 @@
{
ASSERT(frame != nil);
- WebController *newController = [[[frame controller] windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer];
+ WebController *newController = [[[frame controller] windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer behind:NO];
[newController _setTopLevelFrameName:name];
WebFrame *newFrame = [newController mainFrame];
return [newFrame _bridge];
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 738c571..fd61a25 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -20,6 +20,7 @@
@constant WebPolicyOpenURL Open the URL in another application.
@constant WebPolicySaveAndOpen Save and open the resource in another application.
@constant WebPolicyOpenNewWindow Open the resource in another window.
+ @constant WebPolicyOpenNewWindowBehind Open the resource in another window behind this window.
@constant WebPolicyIgnore Do nothing with the resource.
*/
typedef enum {
@@ -30,6 +31,7 @@ typedef enum {
WebPolicyOpenURL,
WebPolicySaveAndOpen,
WebPolicyOpenNewWindow,
+ WebPolicyOpenNewWindowBehind,
WebPolicyIgnore
} WebPolicyAction;
@@ -37,6 +39,7 @@ typedef enum {
@enum WebClickAction
@constant WebClickPolicyShow Have WebKit show the clicked URL.
@constant WebClickPolicyOpenNewWindow Open the clicked URL in another window.
+ @constant WebClickPolicyOpenNewWindowBehind Open the clicked URL in another window behind this window.
@constant WebClickPolicySave Save the clicked URL to disk.
@constant WebClickPolicySaveAndOpenExternally Save the clicked URL to disk and open the file in another application.
@constant WebClickPolicyIgnore Do nothing with the clicked URL.
@@ -44,6 +47,7 @@ typedef enum {
typedef enum {
WebClickPolicyShow = WebPolicyUse,
WebClickPolicyOpenNewWindow = WebPolicyOpenNewWindow,
+ WebClickPolicyOpenNewWindowBehind = WebPolicyOpenNewWindowBehind,
WebClickPolicySave = WebPolicySave,
WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
WebClickPolicyIgnore = WebPolicyIgnore
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 7f664b2..a5f9a4d 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -99,7 +99,7 @@
{
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
WebController *controller = [webFrame controller];
- [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer];
+ [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer behind:NO];
}
- (void)downloadURL:(NSURL *)URL
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 91df3ee..ac7b204 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -260,7 +260,7 @@
}
else if ([name isEqualToString:@"_blank"]){
- WebController *newController = [[[self controller] windowOperationsDelegate] openNewWindowWithURL:nil referrer:nil];
+ WebController *newController = [[[self controller] windowOperationsDelegate] openNewWindowWithURL:nil referrer:nil behind:NO];
[[[[newController windowOperationsDelegate] window] windowController] showWindow:nil];
return [newController mainFrame];
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 6ed8798..bc01a1e 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -152,7 +152,10 @@ BOOL _modifierTrackingEnabled = FALSE;
case WebClickPolicyShow:
return YES;
case WebClickPolicyOpenNewWindow:
- [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil];
+ [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil behind:NO];
+ break;
+ case WebClickPolicyOpenNewWindowBehind:
+ [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:nil behind:YES];
break;
case WebClickPolicySave:
case WebClickPolicySaveAndOpenExternally:
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 738c571..fd61a25 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -20,6 +20,7 @@
@constant WebPolicyOpenURL Open the URL in another application.
@constant WebPolicySaveAndOpen Save and open the resource in another application.
@constant WebPolicyOpenNewWindow Open the resource in another window.
+ @constant WebPolicyOpenNewWindowBehind Open the resource in another window behind this window.
@constant WebPolicyIgnore Do nothing with the resource.
*/
typedef enum {
@@ -30,6 +31,7 @@ typedef enum {
WebPolicyOpenURL,
WebPolicySaveAndOpen,
WebPolicyOpenNewWindow,
+ WebPolicyOpenNewWindowBehind,
WebPolicyIgnore
} WebPolicyAction;
@@ -37,6 +39,7 @@ typedef enum {
@enum WebClickAction
@constant WebClickPolicyShow Have WebKit show the clicked URL.
@constant WebClickPolicyOpenNewWindow Open the clicked URL in another window.
+ @constant WebClickPolicyOpenNewWindowBehind Open the clicked URL in another window behind this window.
@constant WebClickPolicySave Save the clicked URL to disk.
@constant WebClickPolicySaveAndOpenExternally Save the clicked URL to disk and open the file in another application.
@constant WebClickPolicyIgnore Do nothing with the clicked URL.
@@ -44,6 +47,7 @@ typedef enum {
typedef enum {
WebClickPolicyShow = WebPolicyUse,
WebClickPolicyOpenNewWindow = WebPolicyOpenNewWindow,
+ WebClickPolicyOpenNewWindowBehind = WebPolicyOpenNewWindowBehind,
WebClickPolicySave = WebPolicySave,
WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
WebClickPolicyIgnore = WebPolicyIgnore
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 27b16bc..b94e6f8 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -22,9 +22,10 @@
@abstract Open a new window and load the specified URL.
@param URL The URL to load.
@param referrer The referrer to use when loading the URL.
+ @param behind YES to open the window behind this one, NO to open it in front.
@result The WebController for the WebView in the new window.
*/
-- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
+- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind;
/*!
@method setStatusText:
diff --git a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
index 27b16bc..b94e6f8 100644
--- a/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
+++ b/WebKit/WebView.subproj/WebWindowOperationsDelegate.h
@@ -22,9 +22,10 @@
@abstract Open a new window and load the specified URL.
@param URL The URL to load.
@param referrer The referrer to use when loading the URL.
+ @param behind YES to open the window behind this one, NO to open it in front.
@result The WebController for the WebView in the new window.
*/
-- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer;
+- (WebController *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind;
/*!
@method setStatusText:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list