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

[darin]

The following commit has been merged in the debian/unstable branch:
commit f98065fa3f47267866fec2c4c47875812c784ab3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon May 5 02:57:17 2003 +0000

            Reviewed by John.
    
    	- fixed 3131534 -- "javascript:window.open()" leads to page not found error
    
            * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): For open() calls, if the
            first parameter is not present, use "" instead of "undefined" as the URL.
    
    	- fixed 3244766 -- window.open() doesn't position window correctly along the y axis
    
            * kwq/KWQKHTMLPartBrowserExtension.mm: (KHTMLPartBrowserExtension::createNewWindow):
            Fixed the code that flips the y coordinate to take the window height into account.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d4b8bfd..d9dd7e9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-05-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3131534 -- "javascript:window.open()" leads to page not found error
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): For open() calls, if the
+        first parameter is not present, use "" instead of "undefined" as the URL.
+
+	- fixed 3244766 -- window.open() doesn't position window correctly along the y axis
+
+        * kwq/KWQKHTMLPartBrowserExtension.mm: (KHTMLPartBrowserExtension::createNewWindow):
+        Fixed the code that flips the y coordinate to take the window height into account.
+
 2003-05-03  David Hyatt  <hyatt at apple.com>
 
 	Add smallCaps boolean to the string drawing and measuring
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d4b8bfd..d9dd7e9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-05-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3131534 -- "javascript:window.open()" leads to page not found error
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): For open() calls, if the
+        first parameter is not present, use "" instead of "undefined" as the URL.
+
+	- fixed 3244766 -- window.open() doesn't position window correctly along the y axis
+
+        * kwq/KWQKHTMLPartBrowserExtension.mm: (KHTMLPartBrowserExtension::createNewWindow):
+        Fixed the code that flips the y coordinate to take the window height into account.
+
 2003-05-03  David Hyatt  <hyatt at apple.com>
 
 	Add smallCaps boolean to the string drawing and measuring
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 6b3efae..b98d202 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1128,6 +1128,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
     if ( policy != 0 && !(part->findFrame(frameName) || frameName == "_top" || frameName == "_parent" || frameName == "_self")) {
       return Undefined();
     } else {
+      if (v.type() == UndefinedType)
+        str = QString();
+
       KParts::WindowArgs winargs;
 
       // scan feature argument
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index dc7f4a8..6fe6a36 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -122,7 +122,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
 	
 	if (winArgs.ySet) {
 	    float heightForFlip = NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]);
-	    frame.origin.y = heightForFlip - winArgs.y;
+	    frame.origin.y = heightForFlip - (winArgs.y + frame.size.height);
 	}
 	
 	if (winArgs.widthSet) {

-- 
WebKit Debian packaging