diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 22:27:40 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 22:27:40 +0000 |
| commit | da00ef31e290456098968474a61175b681e9c567 (patch) | |
| tree | 15e0570330e90b62a30d4191cefc7e92fc7d709a /webkit | |
| parent | 8804b4bfda8553e7e7692292708d959fc29e2454 (diff) | |
| download | chromium_src-da00ef31e290456098968474a61175b681e9c567.zip chromium_src-da00ef31e290456098968474a61175b681e9c567.tar.gz chromium_src-da00ef31e290456098968474a61175b681e9c567.tar.bz2 | |
Merge 32726 - Rebaseline this layout test for Mac: window.openDatabase() works on Macs now.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/414068
TBR=dumi@chromium.org
Review URL: http://codereview.chromium.org/439011
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt | 5 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt index abc671f..48ade0f 100644 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt @@ -52,6 +52,8 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-call.html. Domains, protocols and ports must match. +CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-get-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-call.html. Domains, protocols and ports must match. + ----- tests for calling methods of another frame using Function.call ----- @@ -64,7 +66,7 @@ PASS: window.confirm.call(targetWindow, 'message') should be 'undefined' and is. PASS: window.prompt.call(targetWindow, 'message', 'defaultValue') should be 'undefined' and is. PASS: window.getComputedStyle.call(targetWindow, document.body, '') should be 'undefined' and is. PASS: window.getMatchedCSSRules.call(targetWindow, document.body, '', false) should be 'undefined' and is. -*** FAIL: window.openDatabase.call(targetWindow, 'name') should be 'undefined' but instead is TypeError: Cannot call method 'call' of undefined. *** +PASS: window.openDatabase.call(targetWindow, 'name') should be 'undefined' and is. PASS: window.atob.call(targetWindow, 'string') should be 'undefined' and is. PASS: window.btoa.call(targetWindow, 'string') should be 'undefined' and is. PASS: window.open.call(targetWindow, '') should be 'undefined' and is. @@ -84,3 +86,4 @@ PASS: window.resizeBy.call(targetWindow, 0, 0); should be 'undefined' and is. PASS: window.resizeTo.call(targetWindow, 0, 0); should be 'undefined' and is. *** FAIL: window.showModalDialog.call(targetWindow); should be 'TypeError: Result of expression 'window.showModalDialog' [undefined] is not an object.' but instead is undefined. *** PASS: window.location.toString.call(targetWindow.location) should be 'undefined' and is. + diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 737ba9c..3f48fd4 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -711,8 +711,6 @@ BUG27697 SKIP : LayoutTests/storage/hash-change-with-xhr.html = PASS WONTFIX SKIP : LayoutTests/storage/private-browsing-readonly.html = PASS // We have not designed the quota management system in Chromium yet BUG_DUMI SKIP : LayoutTests/storage/quota-tracking.html = PASS -// Not sure why this fails, but seems to be related to the call to openDatabase() -BUG_DUMI SKIP : LayoutTests/http/tests/security/cross-frame-access-call.html = PASS // Implement HTML5 Geolocation API. BUG11246 : LayoutTests/fast/dom/Geolocation = FAIL |