[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 07:35:40 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 77ebe7b739aaddf29da743eb7e2a79f75e2b451a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 9 19:02:36 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3222708 -- REGRESSION: repro crash trying to read news at nttdocomo
    
            * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Make window.open do its location
            change with scheduleRedirection like all the other JavaScript calls that change location.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4052 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5a390ad..b0455c9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3222708 -- REGRESSION: repro crash trying to read news at nttdocomo
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Make window.open do its location
+        change with scheduleRedirection like all the other JavaScript calls that change location.
+
 2003-04-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5a390ad..b0455c9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3222708 -- REGRESSION: repro crash trying to read news at nttdocomo
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Make window.open do its location
+        change with scheduleRedirection like all the other JavaScript calls that change location.
+
 2003-04-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 9905e5d..b01c254 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1255,12 +1255,18 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
             khtmlpart->docImpl()->setBaseURL( part->docImpl()->baseURL() );
           }
         }
+#if APPLE_CHANGES
+        if (!url.isEmpty())
+          // FIXME: Need to pass referrer here.
+          khtmlpart->scheduleRedirection(0, url.url(), false);
+#else
         uargs.serviceType = QString::null;
         if (uargs.frameName == "_blank")
           uargs.frameName = QString::null;
         if (!url.isEmpty())
 	  // FIXME: need to pass referrer here
           emit khtmlpart->browserExtension()->openURLRequest(url,uargs);
+#endif
         return Window::retrieve(khtmlpart); // global object
       } else
         return Undefined();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list