Commit 65e464a5 authored by darin's avatar darin

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
parent 42f65866
2002-12-29 Darin Adler <darin@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@apple.com>
......
2002-12-29 Darin Adler <darin@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@apple.com>
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment