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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit b8cae6d0cef00da18d23ac74465eb10f76cd0c4c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 15 18:30:47 2002 +0000

    	- fixed 3102016 - REGRESSION: Command-clicking on a link can open _two_ windows.
    
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _setJustOpenedForTargetedLink:]):
            (-[WebDataSource _justOpenedForTargetedLink]):
            * WebView.subproj/WebFrame.m:
            (-[WebFrame findOrCreateFramedNamed:]):
            * WebView.subproj/WebFramePrivate.h:
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _continueAfterNavigationPolicy:]):
            (-[WebFrame _loadDataSource:withLoadType:]):
            (-[WebFrame _downloadRequest:toPath:]):
            (-[WebFrame _setJustOpenedForTargetedLink:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d167bc5..c9064be 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-11-15  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3102016 - REGRESSION: Command-clicking on a link can open _two_ windows.
+	
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _setJustOpenedForTargetedLink:]):
+        (-[WebDataSource _justOpenedForTargetedLink]):
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame findOrCreateFramedNamed:]):
+        * WebView.subproj/WebFramePrivate.h:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _continueAfterNavigationPolicy:]):
+        (-[WebFrame _loadDataSource:withLoadType:]):
+        (-[WebFrame _downloadRequest:toPath:]):
+        (-[WebFrame _setJustOpenedForTargetedLink:]):
+
 2002-11-15  Darin Adler  <darin at apple.com>
 
         * WebView.subproj/WebFramePrivate.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d167bc5..c9064be 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-11-15  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3102016 - REGRESSION: Command-clicking on a link can open _two_ windows.
+	
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _setJustOpenedForTargetedLink:]):
+        (-[WebDataSource _justOpenedForTargetedLink]):
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame findOrCreateFramedNamed:]):
+        * WebView.subproj/WebFramePrivate.h:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _continueAfterNavigationPolicy:]):
+        (-[WebFrame _loadDataSource:withLoadType:]):
+        (-[WebFrame _downloadRequest:toPath:]):
+        (-[WebFrame _setJustOpenedForTargetedLink:]):
+
 2002-11-15  Darin Adler  <darin at apple.com>
 
         * WebView.subproj/WebFramePrivate.m:
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index e5d0fe4..3d8e4ea 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -82,6 +82,8 @@
 
     BOOL isDownloading;
     NSString *downloadPath;
+
+    BOOL justOpenedForTargetedLink;
 }
 
 @end
@@ -137,5 +139,7 @@
 - (void)_setLastCheckedRequest:(WebResourceRequest *)request;
 - (void)_setIsDownloading:(BOOL)isDownloading;
 - (void)_setDownloadPath:(NSString *)downloadPath;
+- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened;
+- (BOOL)_justOpenedForTargetedLink;
 
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 885e253..8128363 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -583,6 +583,15 @@
     [downloadPath release];
 }
 
+- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened
+{
+    _private->justOpenedForTargetedLink = justOpened;
+}
+
+- (BOOL)_justOpenedForTargetedLink
+{
+    return _private->justOpenedForTargetedLink;
+}
 
 @end
 
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 2b81fb0..c3cfa5a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -184,6 +184,7 @@
         [controller _setTopLevelFrameName:name];
         [[controller windowOperationsDelegate] showWindow];
         frame = [controller mainFrame];
+	[frame _setJustOpenedForTargetedLink:YES];
     }
 
     ASSERT(frame);
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index a346a5e..9194f3a 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -69,6 +69,7 @@ typedef enum {
     WebResourceRequest *policyRequest;
     id policyTarget;
     SEL policySelector;
+    BOOL justOpenedForTargetedLink;
 }
 
 - (void)setName:(NSString *)name;
@@ -150,5 +151,6 @@ typedef enum {
 
 - (void)_downloadRequest:(WebResourceRequest *)request toPath:(NSString *)path;
 
+- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened;
 
 @end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 0ffe96f..63ef523 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -984,6 +984,11 @@ static const char * const stateNames[] = {
 
     BOOL shouldContinue = NO;
 
+    if ([[self provisionalDataSource] _justOpenedForTargetedLink] && 
+	(policy == WebPolicyOpenNewWindow || policy == WebPolicyOpenNewWindowBehind)) {
+	policy = WebPolicyUse;
+    }
+
     switch (policy) {
     case WebPolicyIgnore:
 	break;
@@ -1352,6 +1357,9 @@ static const char * const stateNames[] = {
         [newDataSource _setOverrideEncoding:[[[self parent] dataSource] _overrideEncoding]];
     }
     [newDataSource _setController:[self controller]];
+    [newDataSource _setJustOpenedForTargetedLink:_private->justOpenedForTargetedLink];
+    _private->justOpenedForTargetedLink = NO;
+
     [_private setProvisionalDataSource:newDataSource];
     
     ASSERT([newDataSource webFrame] == self);
@@ -1370,4 +1378,9 @@ static const char * const stateNames[] = {
     [dataSource release];
 }
 
+- (void)_setJustOpenedForTargetedLink:(BOOL)justOpened
+{
+    _private->justOpenedForTargetedLink = justOpened;
+}
+
 @end

-- 
WebKit Debian packaging