[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 2e5e81f7b0999c8acbb02609e050917418557e27
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 17 18:57:47 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3200259 - REGRESSION: Clicking on Flash links at homestarrunner.com creates blank windows
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView loadPluginRequest:]): Don't always
    	make the window, only do it if the frame doesn't already
    	exist. Duh.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5eacaae..14e12cb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-17  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3200259 - REGRESSION: Clicking on Flash links at homestarrunner.com creates blank windows
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView loadPluginRequest:]): Don't always
+	make the window, only do it if the frame doesn't already
+	exist. Duh.
+
 2003-03-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey and Maciej.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 61213d2..ce1565c 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1026,17 +1026,21 @@ typedef struct {
 
     // FIXME - need to get rid of this window creation which
     // bypasses normal targeted link handling
-    WebController *newController = nil;
-    WebController *currentController = [self controller];
-    id wd = [currentController windowOperationsDelegate];
-    if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
-	newController = [wd controller:currentController createWindowWithRequest:nil];
-    else
-        newController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:currentController createWindowWithRequest:nil];
+    WebFrame *frame = [[self webFrame] findFrameNamed:frameName];
+
+    if (frame == nil) {
+	WebController *newController = nil;
+	WebController *currentController = [self controller];
+	id wd = [currentController windowOperationsDelegate];
+	if ([wd respondsToSelector:@selector(controller:createWindowWithRequest:)])
+	    newController = [wd controller:currentController createWindowWithRequest:nil];
+	else
+	    newController = [[WebDefaultWindowOperationsDelegate sharedWindowOperationsDelegate] controller:currentController createWindowWithRequest:nil];
         
-    [newController _setTopLevelFrameName:frameName];
-    [[newController _windowOperationsDelegateForwarder] controllerShowWindow:newController];
-    WebFrame *frame = [newController mainFrame];
+	[newController _setTopLevelFrameName:frameName];
+	[[newController _windowOperationsDelegateForwarder] controllerShowWindow:newController];
+	frame = [newController mainFrame];
+    }
 
     NSURL *URL = [request URL];
     NSString *JSString = [URL _web_scriptIfJavaScriptURL];

-- 
WebKit Debian packaging