[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 cf0f2c817a595683cf61d866adca178a907c406d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 18 21:20:59 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3191892 - Popup blocking prevents window.open with '_self' as target (superbitdvd.com)
    
            * khtml/ecma/kjs_html.h:
            * khtml/ecma/kjs_window.cpp:
            (WindowFunc::tryCall): Don't apply popup blocking if the call
    	would open something in an existing frame (inlcuding the special
    	_self, _top and _parent frames.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4145 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e88e19a..7be3590 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-04-18  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3191892 - Popup blocking prevents window.open with '_self' as target (superbitdvd.com)
+
+        * khtml/ecma/kjs_html.h:
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Don't apply popup blocking if the call
+	would open something in an existing frame (inlcuding the special
+	_self, _top and _parent frames.
+
 2003-04-18  David Hyatt  <hyatt at apple.com>
 
 	Make sure display:table is not accidentally mutated to
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e88e19a..7be3590 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-04-18  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3191892 - Popup blocking prevents window.open with '_self' as target (superbitdvd.com)
+
+        * khtml/ecma/kjs_html.h:
+        * khtml/ecma/kjs_window.cpp:
+        (WindowFunc::tryCall): Don't apply popup blocking if the call
+	would open something in an existing frame (inlcuding the special
+	_self, _top and _parent frames.
+
 2003-04-18  David Hyatt  <hyatt at apple.com>
 
 	Make sure display:table is not accidentally mutated to
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 96cf18d..6b3efae 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1120,7 +1120,12 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       }
 #endif
     }
-    if ( policy != 0 ) {
+
+    QString frameName = !args[1].isNull() && args[1].type() != UndefinedType ?
+                        args[1].toString(exec).qstring()
+                        : QString("_blank");
+
+    if ( policy != 0 && !(part->findFrame(frameName) || frameName == "_top" || frameName == "_parent" || frameName == "_self")) {
       return Undefined();
     } else {
       KParts::WindowArgs winargs;
@@ -1225,9 +1230,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       }
 
       KParts::URLArgs uargs;
-      uargs.frameName = !args[1].isNull() && args[1].type() != UndefinedType ?
-                        args[1].toString(exec).qstring()
-                        : QString("_blank");
+      uargs.frameName = frameName;
       if ( uargs.frameName == "_top" )
       {
 	  // FIXME: referrer?

-- 
WebKit Debian packaging