Rebaseline a getter precedence tests.

TBR=japhet
TEST=none
BUG=10530
BUG=24205

Review URL: http://codereview.chromium.org/548010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36017 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 234 insertions, 9 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt
new file mode 100644
index 0000000..167af24
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt
@@ -0,0 +1,58 @@
+This tests that a frame with a the same name as function on the window object, has precedence in the lookup.
+
+PASS: typeof window.getSelection should be object and is.
+PASS: typeof window.focus should be object and is.
+PASS: typeof window.blur should be object and is.
+PASS: typeof window.close should be object and is.
+PASS: typeof window.print should be object and is.
+PASS: typeof window.stop should be object and is.
+PASS: typeof window.alert should be object and is.
+PASS: typeof window.confirm should be object and is.
+PASS: typeof window.prompt should be object and is.
+PASS: typeof window.find should be object and is.
+PASS: typeof window.scrollBy should be object and is.
+PASS: typeof window.scrollTo should be object and is.
+PASS: typeof window.scroll should be object and is.
+PASS: typeof window.moveBy should be object and is.
+PASS: typeof window.moveTo should be object and is.
+PASS: typeof window.resizeBy should be object and is.
+PASS: typeof window.resizeTo should be object and is.
+PASS: typeof window.getComputedStyle should be object and is.
+PASS: typeof window.getMatchedCSSRules should be object and is.
+PASS: typeof window.openDatabase should be object and is.
+PASS: typeof window.postMessage should be object and is.
+PASS: typeof window.atob should be object and is.
+PASS: typeof window.btoa should be object and is.
+PASS: typeof window.open should be object and is.
+PASS: typeof window.setTimeout should be object and is.
+PASS: typeof window.clearTimeout should be object and is.
+PASS: typeof window.setInterval should be object and is.
+PASS: typeof window.clearInterval should be object and is.
+PASS: typeof window.addEventListener should be object and is.
+PASS: typeof window.removeEventListener should be object and is.
+PASS: typeof window.showModalDialog should be object and is.
+PASS: typeof window.captureEvents should be object and is.
+PASS: typeof window.releaseEvents should be object and is.
+FAIL: typeof window.eval should be object but instead is function
+FAIL: typeof window.parseInt should be object but instead is function
+FAIL: typeof window.parseFloat should be object but instead is function
+FAIL: typeof window.isNaN should be object but instead is function
+FAIL: typeof window.isFinite should be object but instead is function
+FAIL: typeof window.escape should be object but instead is function
+FAIL: typeof window.unescape should be object but instead is function
+FAIL: typeof window.decodeURI should be object but instead is function
+FAIL: typeof window.decodeURIComponent should be object but instead is function
+FAIL: typeof window.encodeURI should be object but instead is function
+FAIL: typeof window.encodeURIComponent should be object but instead is function
+PASS: typeof window.toString should be object and is.
+PASS: typeof window.toLocaleString should be object and is.
+PASS: typeof window.valueOf should be object and is.
+PASS: typeof window.hasOwnProperty should be object and is.
+PASS: typeof window.propertyIsEnumerable should be object and is.
+PASS: typeof window.isPrototypeOf should be object and is.
+PASS: typeof window.__defineGetter__ should be object and is.
+PASS: typeof window.__defineSetter__ should be object and is.
+PASS: typeof window.__lookupGetter__ should be object and is.
+PASS: typeof window.__lookupSetter__ should be object and is.
+FAIL: typeof window.myFunction should be object but instead is function
+PASS: typeof window.myPrototypeFunction should be object and is.
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
new file mode 100644
index 0000000..26c5934
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
@@ -0,0 +1,58 @@
+This tests that functions of the window object and it's prototype have precedence in lookup over elements with id's of the same name.
+
+PASS: typeof window.getSelection should be function and is.
+PASS: typeof window.focus should be function and is.
+PASS: typeof window.blur should be function and is.
+PASS: typeof window.close should be function and is.
+PASS: typeof window.print should be function and is.
+PASS: typeof window.stop should be function and is.
+PASS: typeof window.alert should be function and is.
+PASS: typeof window.confirm should be function and is.
+PASS: typeof window.prompt should be function and is.
+PASS: typeof window.find should be function and is.
+PASS: typeof window.scrollBy should be function and is.
+PASS: typeof window.scrollTo should be function and is.
+PASS: typeof window.scroll should be function and is.
+PASS: typeof window.moveBy should be function and is.
+PASS: typeof window.moveTo should be function and is.
+PASS: typeof window.resizeBy should be function and is.
+PASS: typeof window.resizeTo should be function and is.
+PASS: typeof window.getComputedStyle should be function and is.
+PASS: typeof window.getMatchedCSSRules should be function and is.
+PASS: typeof window.openDatabase should be function and is.
+PASS: typeof window.postMessage should be function and is.
+PASS: typeof window.atob should be function and is.
+PASS: typeof window.btoa should be function and is.
+PASS: typeof window.open should be function and is.
+PASS: typeof window.setTimeout should be function and is.
+PASS: typeof window.clearTimeout should be function and is.
+PASS: typeof window.setInterval should be function and is.
+PASS: typeof window.clearInterval should be function and is.
+PASS: typeof window.addEventListener should be function and is.
+PASS: typeof window.removeEventListener should be function and is.
+PASS: typeof window.showModalDialog should be function and is.
+PASS: typeof window.captureEvents should be function and is.
+PASS: typeof window.releaseEvents should be function and is.
+PASS: typeof window.eval should be function and is.
+PASS: typeof window.parseInt should be function and is.
+PASS: typeof window.parseFloat should be function and is.
+PASS: typeof window.isNaN should be function and is.
+PASS: typeof window.isFinite should be function and is.
+PASS: typeof window.escape should be function and is.
+PASS: typeof window.unescape should be function and is.
+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.
+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/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt
new file mode 100644
index 0000000..167af24
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt
@@ -0,0 +1,58 @@
+This tests that a frame with a the same name as function on the window object, has precedence in the lookup.
+
+PASS: typeof window.getSelection should be object and is.
+PASS: typeof window.focus should be object and is.
+PASS: typeof window.blur should be object and is.
+PASS: typeof window.close should be object and is.
+PASS: typeof window.print should be object and is.
+PASS: typeof window.stop should be object and is.
+PASS: typeof window.alert should be object and is.
+PASS: typeof window.confirm should be object and is.
+PASS: typeof window.prompt should be object and is.
+PASS: typeof window.find should be object and is.
+PASS: typeof window.scrollBy should be object and is.
+PASS: typeof window.scrollTo should be object and is.
+PASS: typeof window.scroll should be object and is.
+PASS: typeof window.moveBy should be object and is.
+PASS: typeof window.moveTo should be object and is.
+PASS: typeof window.resizeBy should be object and is.
+PASS: typeof window.resizeTo should be object and is.
+PASS: typeof window.getComputedStyle should be object and is.
+PASS: typeof window.getMatchedCSSRules should be object and is.
+PASS: typeof window.openDatabase should be object and is.
+PASS: typeof window.postMessage should be object and is.
+PASS: typeof window.atob should be object and is.
+PASS: typeof window.btoa should be object and is.
+PASS: typeof window.open should be object and is.
+PASS: typeof window.setTimeout should be object and is.
+PASS: typeof window.clearTimeout should be object and is.
+PASS: typeof window.setInterval should be object and is.
+PASS: typeof window.clearInterval should be object and is.
+PASS: typeof window.addEventListener should be object and is.
+PASS: typeof window.removeEventListener should be object and is.
+PASS: typeof window.showModalDialog should be object and is.
+PASS: typeof window.captureEvents should be object and is.
+PASS: typeof window.releaseEvents should be object and is.
+FAIL: typeof window.eval should be object but instead is function
+FAIL: typeof window.parseInt should be object but instead is function
+FAIL: typeof window.parseFloat should be object but instead is function
+FAIL: typeof window.isNaN should be object but instead is function
+FAIL: typeof window.isFinite should be object but instead is function
+FAIL: typeof window.escape should be object but instead is function
+FAIL: typeof window.unescape should be object but instead is function
+FAIL: typeof window.decodeURI should be object but instead is function
+FAIL: typeof window.decodeURIComponent should be object but instead is function
+FAIL: typeof window.encodeURI should be object but instead is function
+FAIL: typeof window.encodeURIComponent should be object but instead is function
+PASS: typeof window.toString should be object and is.
+PASS: typeof window.toLocaleString should be object and is.
+PASS: typeof window.valueOf should be object and is.
+PASS: typeof window.hasOwnProperty should be object and is.
+PASS: typeof window.propertyIsEnumerable should be object and is.
+PASS: typeof window.isPrototypeOf should be object and is.
+PASS: typeof window.__defineGetter__ should be object and is.
+PASS: typeof window.__defineSetter__ should be object and is.
+PASS: typeof window.__lookupGetter__ should be object and is.
+PASS: typeof window.__lookupSetter__ should be object and is.
+FAIL: typeof window.myFunction should be object but instead is function
+PASS: typeof window.myPrototypeFunction should be object and is.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
new file mode 100644
index 0000000..26c5934
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
@@ -0,0 +1,58 @@
+This tests that functions of the window object and it's prototype have precedence in lookup over elements with id's of the same name.
+
+PASS: typeof window.getSelection should be function and is.
+PASS: typeof window.focus should be function and is.
+PASS: typeof window.blur should be function and is.
+PASS: typeof window.close should be function and is.
+PASS: typeof window.print should be function and is.
+PASS: typeof window.stop should be function and is.
+PASS: typeof window.alert should be function and is.
+PASS: typeof window.confirm should be function and is.
+PASS: typeof window.prompt should be function and is.
+PASS: typeof window.find should be function and is.
+PASS: typeof window.scrollBy should be function and is.
+PASS: typeof window.scrollTo should be function and is.
+PASS: typeof window.scroll should be function and is.
+PASS: typeof window.moveBy should be function and is.
+PASS: typeof window.moveTo should be function and is.
+PASS: typeof window.resizeBy should be function and is.
+PASS: typeof window.resizeTo should be function and is.
+PASS: typeof window.getComputedStyle should be function and is.
+PASS: typeof window.getMatchedCSSRules should be function and is.
+PASS: typeof window.openDatabase should be function and is.
+PASS: typeof window.postMessage should be function and is.
+PASS: typeof window.atob should be function and is.
+PASS: typeof window.btoa should be function and is.
+PASS: typeof window.open should be function and is.
+PASS: typeof window.setTimeout should be function and is.
+PASS: typeof window.clearTimeout should be function and is.
+PASS: typeof window.setInterval should be function and is.
+PASS: typeof window.clearInterval should be function and is.
+PASS: typeof window.addEventListener should be function and is.
+PASS: typeof window.removeEventListener should be function and is.
+PASS: typeof window.showModalDialog should be function and is.
+PASS: typeof window.captureEvents should be function and is.
+PASS: typeof window.releaseEvents should be function and is.
+PASS: typeof window.eval should be function and is.
+PASS: typeof window.parseInt should be function and is.
+PASS: typeof window.parseFloat should be function and is.
+PASS: typeof window.isNaN should be function and is.
+PASS: typeof window.isFinite should be function and is.
+PASS: typeof window.escape should be function and is.
+PASS: typeof window.unescape should be function and is.
+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.
+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/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 8fc9d7f8..ec59b13 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -92,6 +92,8 @@ BUG24182 SLOW DEBUG : LayoutTests/editing/selection/extend-selection.html = PASS
 BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
 BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
 BUG24182 WIN DEBUG SLOW: LayoutTests/inspector/console-dirxml.html = PASS
+BUG24182 DEBUG SLOW : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = PASS
+
 
 // Usually <1s in release, ~1s in debug, but occasionally >5s in release.
 BUG27335 WIN RELEASE : LayoutTests/plugins/embed-attributes-setting.html = PASS TIMEOUT
@@ -719,10 +721,6 @@ BUG26734 LINUX MAC SKIP : LayoutTests/inspector = PASS
 BUG26734 SKIP : LayoutTests/inspector/console-format-collections.html = TEXT
 BUG26734 SKIP : LayoutTests/inspector/console-format.html = TEXT
 
-// Fails due to storage APIs not implemented.  Might be worth re-baselining
-// temporarily so the rest of the conditions are still tested.
-BUG24205 : LayoutTests/fast/dom/Window/window-function-name-getter-precedence.html = FAIL
-
 // These tests are disabled until <audio> and <video> tags are supported.
 // Disable <video> and <audio> tests for mac and linux until there is
 // proper support.
@@ -2361,11 +2359,6 @@ BUG9962 MAC : LayoutTests/fast/js/function-apply-aliased.html = FAIL
 // Regressions from WebKit merge 43264:42403, unknown cause(s)
 BUG10055 MAC : LayoutTests/fast/events/updateLayoutForHitTest.html = FAIL
 
-// This test was changed upstream in http://trac.webkit.org/changeset/42447
-// to include window.showModalDialog, which we give as undefined.
-BUG10530 RELEASE : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = TEXT
-BUG10530 DEBUG SLOW : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL
-
 // New tests from WebKit Merge 42609:42671
 BUG10760 LINUX : LayoutTests/fast/forms/input-text-scroll-left-on-blur.html = FAIL
 BUG10760 LINUX : LayoutTests/fast/inline/25277-2.html = FAIL