Landing 37604:38097 merge

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

4 files changed, 46 insertions, 6 deletions

diff --git a/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/README b/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/README
index f8b3810..788b1c3 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/README
+++ b/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/README
@@ -3,7 +3,6 @@ This file documents why the various tests have been rebaselined.
 cross-frame-access-custom-expected.txt
 cross-frame-access-get-expected.txt
 cross-frame-access-get-override-expected.txt
-cross-frame-access-history-put-expected.txt
 cross-frame-access-history-get-override-expected.txt
 cross-frame-access-location-get-override-expected.txt
 cross-frame-access-location-put-expected.txt
@@ -17,3 +16,11 @@ cross-frame-access-history-get-expected.txt
 Chrome does not allow cross-domain access History.toString,
 same as Firefox.
 
+cross-frame-access-history-put-expected.txt
+===============================================================
+Differs in function printing.
+
+cross-frame-access-call-expected.txt
+===============================================================
+Error message differs because we don't have window.openDatabase.
+The error message from showModalDialog is more sane than the layout tests expect.
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt
index a8267b7..abc671f 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt
@@ -50,6 +50,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 -----
@@ -66,4 +68,19 @@ PASS: window.getMatchedCSSRules.call(targetWindow, document.body, '', false) sho
 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.
+PASS: window.addEventListener.call(targetWindow, 'load', null, false); should be 'undefined' and is.
+PASS: window.removeEventListener.call(targetWindow, 'load', null, false); should be 'undefined' and is.
+PASS: window.clearTimeout.call(targetWindow, 0); should be 'undefined' and is.
+PASS: window.clearInterval.call(targetWindow, 0); should be 'undefined' and is.
+PASS: window.print.call(targetWindow); should be 'undefined' and is.
+PASS: window.stop.call(targetWindow); should be 'undefined' and is.
+PASS: window.alert.call(targetWindow, 'message'); should be 'undefined' and is.
+PASS: window.scrollBy.call(targetWindow, 0, 0); should be 'undefined' and is.
+PASS: window.scrollTo.call(targetWindow, 0, 0); should be 'undefined' and is.
+PASS: window.scroll.call(targetWindow, 0, 0); should be 'undefined' and is.
+PASS: window.moveBy.call(targetWindow, 0, 0); should be 'undefined' and is.
+PASS: window.moveTo.call(targetWindow, 0, 0); should be 'undefined' and is.
+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/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
index 89a07bc..d920c58 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
@@ -1,12 +1,27 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-history-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-history-put.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-history-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-history-put.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-history-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-history-put.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-history-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-history-put.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-history-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-history-put.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-history-put-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-history-put.html. Domains, protocols and ports must match.
 
 
-YOUR BROWSER DOES NOT SUPPORT window.postMessage
-To run this test manually, first click the button titled 'Step 1 - Set Test' in this frame.
-Then click the button in the sub frame titled 'Step 2 - Set Check' to finish the test.
 
-Step 1 - Set Test
 
 --------
 Frame: '<!--framePath //<!--frame0-->-->'
 --------
-Step 2 - Set Check
+
+----- tests for putting window.history's properties -----
+
+PASS: window.history.back should be 'function () { [native code] }' and is.
+PASS: window.history.forward should be 'function () { [native code] }' and is.
+PASS: window.history.go should be 'function () { [native code] }' and is.
+PASS: window.history.toString should be 'function toString() {  var c = ClassOf(this);  if (c === 'Arguments') c  = 'Object';  return "[object " + c + "]";}' and is.
+PASS: window.history.length matched the expected value.
+PASS: window.history.customAttribute should be 'customAttribute' and is.
diff --git a/webkit/data/layout_tests/pending/security/block-test.html b/webkit/data/layout_tests/pending/security/block-test.html
index edc1483..e9c9f85 100644
--- a/webkit/data/layout_tests/pending/security/block-test.html
+++ b/webkit/data/layout_tests/pending/security/block-test.html
@@ -29,6 +29,7 @@
         testIMG.setAttribute("onError", "ftp21Test();");
         var newURL = "ftp://" + baseURL + "/test.jpg";
         testIMG.src = newURL;
+        finishTesting();
     }
     
     function ftp21Test() {