[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 c147064db4ffb94e33a0da4b2ccc302c754c755b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 7 22:02:25 2002 +0000

            Allow plug-ins to make a NPP_*URLNotify request when
            the target is _self, _top, _parent or _current. This goes
            against the plug-in documentation, but mimics IE.
            Need for iTools.
    
            * Plugins.subproj/IFPluginView.mm:
            (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 989f51b..de36e38 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-07  Chris Blumenberg  <cblu at apple.com>
+	
+	Allow plug-ins to make a NPP_*URLNotify request when
+	the target is _self, _top, _parent or _current. This goes
+	against the plug-in documentation, but mimics IE.
+	Need for iTools.
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+
 2002-06-07  Darin Adler  <darin at apple.com>
 
 	* WebKit.pbproj/project.pbxproj: Don't use any warning flags for C that won't work
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 989f51b..de36e38 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-06-07  Chris Blumenberg  <cblu at apple.com>
+	
+	Allow plug-ins to make a NPP_*URLNotify request when
+	the target is _self, _top, _parent or _current. This goes
+	against the plug-in documentation, but mimics IE.
+	Need for iTools.
+
+	* Plugins.subproj/IFPluginView.mm:
+	(-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+
 2002-06-07  Darin Adler  <darin at apple.com>
 
 	* WebKit.pbproj/project.pbxproj: Don't use any warning flags for C that won't work
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index f7fc791..ae7fa71 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -620,13 +620,16 @@ static char *newCString(NSString *string)
                 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;
+                if(![target isEqualToString:@"_self"] && ![target isEqualToString:@"_current"] && 
+                    ![target isEqualToString:@"_parent"] && ![target isEqualToString:@"_top"]){
+    
+                    [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];
+                // Plug-in docs say to return NPERR_INVALID_PARAM here
+                // but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
+                // so we have to allow this as well. Needed for iTools.
             }
             dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
             [frame setProvisionalDataSource:dataSource];
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index f7fc791..ae7fa71 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -620,13 +620,16 @@ static char *newCString(NSString *string)
                 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;
+                if(![target isEqualToString:@"_self"] && ![target isEqualToString:@"_current"] && 
+                    ![target isEqualToString:@"_parent"] && ![target isEqualToString:@"_top"]){
+    
+                    [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];
+                // Plug-in docs say to return NPERR_INVALID_PARAM here
+                // but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
+                // so we have to allow this as well. Needed for iTools.
             }
             dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
             [frame setProvisionalDataSource:dataSource];

-- 
WebKit Debian packaging