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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 73a9c3b16bda3116d4757f8b4726f206634c8154
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 28 21:07:37 2002 +0000

    *** empty log message ***
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1226 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0fa872b..dfdc73b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-05-28  Chris Blumenberg  <cblu at apple.com>
 
+	Added support for creating a new window from a plug-in (2938004)
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+
+2002-05-28  Chris Blumenberg  <cblu at apple.com>
+
 	* Plugins.subproj/IFPluginDatabase.h:
 	* Plugins.subproj/IFPluginDatabase.m:
 	(-[IFPluginDatabase pluginForMimeType:]): renamed
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0fa872b..dfdc73b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-05-28  Chris Blumenberg  <cblu at apple.com>
 
+	Added support for creating a new window from a plug-in (2938004)
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+
+2002-05-28  Chris Blumenberg  <cblu at apple.com>
+
 	* Plugins.subproj/IFPluginDatabase.h:
 	* Plugins.subproj/IFPluginDatabase.m:
 	(-[IFPluginDatabase pluginForMimeType:]): renamed
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index bb47b15..4f1240b 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -601,21 +601,25 @@ static char *newCString(NSString *string)
     }else{
         frame = [webFrame frameNamed:target];
         if(!frame){
-            //FIXME: Create new window here (2931449)
-            return NPERR_GENERIC_ERROR;
-        }
-        if(notifyData){
-            if([target isEqualToString:@"_self"] || [target isEqualToString:@"_current"] || 
-               [target isEqualToString:@"_parent"] || [target isEqualToString:@"_top"]){
-                // return error since notification can't be sent to a plug-in that will no longer exist
-                return NPERR_INVALID_PARAM;
+            [webController openNewWindowWithURL:url];
+            // FIXME: Need to send NPP_URLNotify at the right time.
+            // FIXME: Need to name new frame
+            if(notifyData)
+                NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
+        }else{
+            if(notifyData){
+                if([target isEqualToString:@"_self"] || [target isEqualToString:@"_current"] || 
+                    [target isEqualToString:@"_parent"] || [target isEqualToString:@"_top"]){
+                    // return error since notification can't be sent to a plug-in that will no longer exist
+                    return NPERR_INVALID_PARAM;
+                }
+                [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(frameStateChanged:) name:IFFrameStateChangedNotification object:frame];
             }
-            [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
-            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(frameStateChanged:) name:IFFrameStateChangedNotification object:frame];
+            dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
+            [frame setProvisionalDataSource:dataSource];
+            [frame startLoading];
         }
-        dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
-        [frame setProvisionalDataSource:dataSource];
-        [frame startLoading];
     }
     return NPERR_NO_ERROR;
 }
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index bb47b15..4f1240b 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -601,21 +601,25 @@ static char *newCString(NSString *string)
     }else{
         frame = [webFrame frameNamed:target];
         if(!frame){
-            //FIXME: Create new window here (2931449)
-            return NPERR_GENERIC_ERROR;
-        }
-        if(notifyData){
-            if([target isEqualToString:@"_self"] || [target isEqualToString:@"_current"] || 
-               [target isEqualToString:@"_parent"] || [target isEqualToString:@"_top"]){
-                // return error since notification can't be sent to a plug-in that will no longer exist
-                return NPERR_INVALID_PARAM;
+            [webController openNewWindowWithURL:url];
+            // FIXME: Need to send NPP_URLNotify at the right time.
+            // FIXME: Need to name new frame
+            if(notifyData)
+                NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
+        }else{
+            if(notifyData){
+                if([target isEqualToString:@"_self"] || [target isEqualToString:@"_current"] || 
+                    [target isEqualToString:@"_parent"] || [target isEqualToString:@"_top"]){
+                    // return error since notification can't be sent to a plug-in that will no longer exist
+                    return NPERR_INVALID_PARAM;
+                }
+                [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(frameStateChanged:) name:IFFrameStateChangedNotification object:frame];
             }
-            [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
-            [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(frameStateChanged:) name:IFFrameStateChangedNotification object:frame];
+            dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
+            [frame setProvisionalDataSource:dataSource];
+            [frame startLoading];
         }
-        dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
-        [frame setProvisionalDataSource:dataSource];
-        [frame startLoading];
     }
     return NPERR_NO_ERROR;
 }

-- 
WebKit Debian packaging