summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 02:32:58 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-21 02:32:58 +0000
commit6c6573a9a4f60f0fc5c4c0efd9a1f209b862791c (patch)
tree771d2f6fccbf1bd83d9baa12a511d9812bb84377 /webkit/data
parentfcd6b6932f504278d558c1c15f9fb44418cc50f1 (diff)
downloadchromium_src-6c6573a9a4f60f0fc5c4c0efd9a1f209b862791c.zip
chromium_src-6c6573a9a4f60f0fc5c4c0efd9a1f209b862791c.tar.gz
chromium_src-6c6573a9a4f60f0fc5c4c0efd9a1f209b862791c.tar.bz2
Rebaseline this layout test for Mac: window.openDatabase() works on Macs now.
TEST=none BUG=none Review URL: http://codereview.chromium.org/414068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt5
1 files changed, 4 insertions, 1 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.
+