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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:45:35 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f6a6540df3cf8f7a1edb91a671143f32d0165396
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 28 08:06:16 2002 +0000

    	- fixed 3022441 -- scroll bar is missing in window created with window.open
    
            * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
    	parameters to window.open were using isNull, which checks for a null ValueImp
    	pointer, not an "Undefined".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e9871c3..5751d1a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-09-28  Darin Adler  <darin at apple.com>
 
+	- fixed 3022441 -- scroll bar is missing in window created with window.open
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
+	parameters to window.open were using isNull, which checks for a null ValueImp
+	pointer, not an "Undefined".
+
+2002-09-28  Darin Adler  <darin at apple.com>
+
 	- fixed 2886111 -- changing font or size preference causes open
 	windows to redraw incorrectly
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e9871c3..5751d1a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-09-28  Darin Adler  <darin at apple.com>
 
+	- fixed 3022441 -- scroll bar is missing in window created with window.open
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
+	parameters to window.open were using isNull, which checks for a null ValueImp
+	pointer, not an "Undefined".
+
+2002-09-28  Darin Adler  <darin at apple.com>
+
 	- fixed 2886111 -- changing font or size preference causes open
 	windows to redraw incorrectly
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e9871c3..5751d1a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-09-28  Darin Adler  <darin at apple.com>
 
+	- fixed 3022441 -- scroll bar is missing in window created with window.open
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): The checks for extra
+	parameters to window.open were using isNull, which checks for a null ValueImp
+	pointer, not an "Undefined".
+
+2002-09-28  Darin Adler  <darin at apple.com>
+
 	- fixed 2886111 -- changing font or size preference causes open
 	windows to redraw incorrectly
 
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 1459e91..d67c428 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1035,7 +1035,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       // scan feature argument
       v = args[2];
       QString features;
-      if (!v.isNull()) {
+      if (!v.isNull() && v.type() != UndefinedType) {
         features = v.toString(exec).qstring();
         // specifying window params means false defaults
         winargs.menuBarVisible = false;
@@ -1128,7 +1128,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       }
 
       KParts::URLArgs uargs;
-      uargs.frameName = !args[1].isNull() ?
+      uargs.frameName = !args[1].isNull() && args[1].type() != UndefinedType ?
                         args[1].toString(exec).qstring()
                         : QString("_blank");
       if ( uargs.frameName == "_top" )

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list