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

Sat Sep 26 07:17:40 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 65e464a5bed0dad5035c2479f70a7cecf26594a8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 29 17:26:34 2002 +0000

            Reviewed by Ken.
    
    	- fixed 3134560 -- Lord of the Rings desktops don't load
    
            * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Removed the APPLE_CHANGES here.
    	The comment claims that we don't need the code because "JavaScript will do the work
    	below on demand", but that's not true for setting the base URL. Also, the comment
    	claims that this "adds an extra entry to the back/forward list", but testing does not
    	bear that out.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3200 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8a163f7..e22de7c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed 3134560 -- Lord of the Rings desktops don't load
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Removed the APPLE_CHANGES here.
+	The comment claims that we don't need the code because "JavaScript will do the work
+	below on demand", but that's not true for setting the base URL. Also, the comment
+	claims that this "adds an extra entry to the back/forward list", but testing does not
+	bear that out.
+
 === Alexander-46 ===
 
 2002-12-28  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8a163f7..e22de7c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+	- fixed 3134560 -- Lord of the Rings desktops don't load
+
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): Removed the APPLE_CHANGES here.
+	The comment claims that we don't need the code because "JavaScript will do the work
+	below on demand", but that's not true for setting the base URL. Also, the comment
+	claims that this "adds an extra entry to the back/forward list", but testing does not
+	bear that out.
+
 === Alexander-46 ===
 
 2002-12-28  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index cbab0c3..0c0407a 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1225,11 +1225,6 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
         //qDebug("opener set to %p (this Window's part) in new Window %p  (this Window=%p)",part,win,window);
         khtmlpart->setOpener(part);
         khtmlpart->setOpenedByJS(true);
-#if APPLE_CHANGES
-	// We don't need this because accessing document from
-	// JavaScript will do the work below on demand, and having
-	// this in adds an extra entry to the back/forward list.
-#else
         if (khtmlpart->document().isNull()) {
           khtmlpart->begin();
           khtmlpart->write("<HTML><BODY>");
@@ -1240,7 +1235,6 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
             khtmlpart->docImpl()->setBaseURL( part->docImpl()->baseURL() );
           }
         }
-#endif
         uargs.serviceType = QString::null;
         if (uargs.frameName == "_blank")
           uargs.frameName = QString::null;

-- 
WebKit Debian packaging

