From 27111855e51e2436511fea678f6bac116457a58a Mon Sep 17 00:00:00 2001 From: mjs Date: Tue, 4 Jan 2005 03:10:28 +0000 Subject: [PATCH] Reviewed by John and Kevin. REGRESSION(125.9-125.11) broken behavior at test.profoundlearning.com - used to * khtml/ecma/kjs_window.cpp: (Window::get): Look up frame names before buitin window properties to match other browsers. This regressed because we added a builtin "toolbar" property but this site had a frame with that name. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8288 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog-2005-08-23 | 11 +++++++++++ WebCore/khtml/ecma/kjs_window.cpp | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23 index 150d47c80753..676ee0b83dd9 100644 --- a/WebCore/ChangeLog-2005-08-23 +++ b/WebCore/ChangeLog-2005-08-23 @@ -1,3 +1,14 @@ +2005-01-03 Maciej Stachowiak + + Reviewed by John and Kevin. + + REGRESSION(125.9-125.11) broken behavior at test.profoundlearning.com - used to + + * khtml/ecma/kjs_window.cpp: + (Window::get): Look up frame names before buitin window properties + to match other browsers. This regressed because we added a builtin + "toolbar" property but this site had a frame with that name. + 2004-12-21 Maciej Stachowiak Reviewed by Darin. diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp index 6ea1ad908223..5583a342b5c3 100644 --- a/WebCore/khtml/ecma/kjs_window.cpp +++ b/WebCore/khtml/ecma/kjs_window.cpp @@ -470,6 +470,12 @@ Value Window::get(ExecState *exec, const Identifier &p) const return Value(val); } + // Check for child frames by name before built-in properties to + // match behavior of other browsers. + KHTMLPart *childFrame = m_part->childFrameNamed(p.ustring().qstring()); + if (childFrame) + return retrieve(childFrame); + const HashEntry* entry = Lookup::findEntry(&WindowTable, p); if (entry) { -- 2.36.0