Changeset 24528 in webkit

Timestamp:

Jul 22, 2007 10:28:37 PM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Darin.

Test for ​http://bugs.webkit.org/show_bug.cgi?id=14682
REGRESSION(24285-24399): alerts do not appear at W3C RTL test page

• fast/dom/Window/window-function-name-getter-precedence-expected.txt: Added.
• fast/dom/Window/window-function-name-getter-precedence.html: Added.

WebCore:

Reviewed by Darin.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=14682
REGRESSION(24285-24399): alerts do not appear at W3C RTL test page

Test: fast/dom/Window/window-function-name-getter-precedence.html

• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetOwnPropertySlot): Make sure to return functions before the custom name getter.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt (added)
• LayoutTests/fast/dom/Window/window-function-name-getter-precedence.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-22  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin.
+
+        Test for  http://bugs.webkit.org/show_bug.cgi?id=14682
+        REGRESSION(24285-24399): alerts do not appear at W3C RTL test page
+
+        * fast/dom/Window/window-function-name-getter-precedence-expected.txt: Added.
+        * fast/dom/Window/window-function-name-getter-precedence.html: Added.
+
 2007-07-22  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-22  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=14682
+        REGRESSION(24285-24399): alerts do not appear at W3C RTL test page
+
+        Test: fast/dom/Window/window-function-name-getter-precedence.html
+
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::customGetOwnPropertySlot): Make sure to return functions
+        before the custom name getter.
+
 2007-07-22  Darin Adler  <darin@apple.com>
 

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -83 +83 @@
                         slot.setStaticEntry(this, entry, KJS::staticFunctionGetter<JSDOMWindowPrototypeFunction>);
                         return true;
+                    default:
+                        if (!isSafeScript(exec))
+                            slot.setUndefined(this);
+                        else
+                            slot.setStaticEntry(this, entry, KJS::staticFunctionGetter<JSDOMWindowPrototypeFunction>);
+                        return true;
                 }
             }