Reviewed by John and Kevin.

	<rdar://problem/3870317> 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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 150d47c80753bdf7365f0434fbf7c98405c1efab..676ee0b83dd9582e9ff0626245b56dfc5f642325 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2005-01-03  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by John and Kevin.
+
+       <rdar://problem/3870317> 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  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 6ea1ad908223f4e000bfbaf15281e58472253b0f..5583a342b5c3d5fd4aa06d56aee15f73e9d91e6c 100644 (file)
--- 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)
   {