WebCore:

        Reviewed by Darin Adler.

        Search the entire prototype chain when doing early prototype lookup in
        the Window's getOwnPropertySlot method.

        Makes fast/dom/Window/window-function-name-getter-precedence.html pass all tests.

        * bindings/js/kjs_window.cpp:
        (KJS::Window::getOwnPropertySlot):

LayoutTests:

        Reviewed by Darin Adler.

        Update test result.

        * fast/dom/Window/window-function-name-getter-precedence-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7e27202dbcd212b7f89a448ff66d54f2679e0363..6bf7a351c998b52000ee8a2abaaa7d201e03ecd7 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-01  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Update test result.
+
+        * fast/dom/Window/window-function-name-getter-precedence-expected.txt:
+
 2008-03-01  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver.

diff --git a/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt b/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
index dfe10bce4183a2c6d7485c0c9a0d7ded6f3e6ca3..15fa97d5f22e5cb7593d3cf02b4bd9c5f3ed73f1 100644 (file)
--- a/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
@@ -44,15 +44,15 @@ PASS: typeof window.decodeURI should be function and is.
 PASS: typeof window.decodeURIComponent should be function and is.
 PASS: typeof window.encodeURI should be function and is.
 PASS: typeof window.encodeURIComponent should be function and is.
-FAIL: typeof window.toString should be function but instead is object
-FAIL: typeof window.toLocaleString should be function but instead is object
-FAIL: typeof window.valueOf should be function but instead is object
-FAIL: typeof window.hasOwnProperty should be function but instead is object
-FAIL: typeof window.propertyIsEnumerable should be function but instead is object
-FAIL: typeof window.isPrototypeOf should be function but instead is object
-FAIL: typeof window.__defineGetter__ should be function but instead is object
-FAIL: typeof window.__defineSetter__ should be function but instead is object
-FAIL: typeof window.__lookupGetter__ should be function but instead is object
-FAIL: typeof window.__lookupSetter__ should be function but instead is object
+PASS: typeof window.toString should be function and is.
+PASS: typeof window.toLocaleString should be function and is.
+PASS: typeof window.valueOf should be function and is.
+PASS: typeof window.hasOwnProperty should be function and is.
+PASS: typeof window.propertyIsEnumerable should be function and is.
+PASS: typeof window.isPrototypeOf should be function and is.
+PASS: typeof window.__defineGetter__ should be function and is.
+PASS: typeof window.__defineSetter__ should be function and is.
+PASS: typeof window.__lookupGetter__ should be function and is.
+PASS: typeof window.__lookupSetter__ should be function and is.
 PASS: typeof window.myFunction should be function and is.
 PASS: typeof window.myPrototypeFunction should be function and is.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b6cfe2774b4d370cd92a034b3dcf0f19f02a5253..b95f172542afa058eeb456e5d57e37f1e3f601c1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-01  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Search the entire prototype chain when doing early prototype lookup in
+        the Window's getOwnPropertySlot method.
+
+        Makes fast/dom/Window/window-function-name-getter-precedence.html pass all tests.
+
+        * bindings/js/kjs_window.cpp:
+        (KJS::Window::getOwnPropertySlot):
+
 2008-03-01  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver.

diff --git a/WebCore/bindings/js/kjs_window.cpp b/WebCore/bindings/js/kjs_window.cpp
index a3fadb06a7096f49b513f96fc372038dd854b3da..04d65cca2c2e96e43b4fe412d8e7e2396b076f9c 100644 (file)
--- a/WebCore/bindings/js/kjs_window.cpp
+++ b/WebCore/bindings/js/kjs_window.cpp
@@ -642,7 +642,7 @@ bool Window::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName,
     // precedence over the index and name getters.  
     JSValue* proto = prototype();
     if (proto->isObject()) {
-        if (static_cast<JSObject*>(proto)->getOwnPropertySlot(exec, propertyName, slot)) {
+        if (static_cast<JSObject*>(proto)->getPropertySlot(exec, propertyName, slot)) {
             if (!allowsAccessFrom(exec))
                 slot.setUndefined(this);
             return true;