Changeset 61599 in webkit
- Timestamp:
- Jun 21, 2010 9:24:02 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 added
- 7 deleted
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r61595 r61599 1 2010-06-21 Prasad Tammana <prasadt@chromium.org> 2 3 Reviewed by Darin Adler, Dmitry Titov. 4 5 DumpRenderTree should allow tests with modal dialogs 6 https://bugs.webkit.org/show_bug.cgi?id=35350 7 8 Added a new test show-modal-dialog.html to harness tests to verify that showModalDialog works. 9 10 Added a new test, show-modal-dialog-onblur-onfocus.html, that takes advantage of the showModalDialog 11 functionality added to UIDelegate.mm. The test is only enabled on mac for now. This test will catch 12 regressions on the bug fix for https://bugs.webkit.org/show_bug.cgi?id=33962. 13 14 Support for showModalDialog affected the expected output for many tests that operate under the assumption 15 that the method is undefined. Modified the tests accordingly, in some cases disabled showModalDialog (not 16 currently tested anyway. Opened a bug to add showModalDialog specific tests where appropriate - Bug# 39897. 17 18 * fast/dom/Window/window-function-frame-getter-precedence-expected.txt: 19 * fast/dom/Window/window-function-frame-getter-precedence.html: 20 * fast/dom/Window/window-function-name-getter-precedence-expected.txt: 21 * fast/dom/Window/window-function-name-getter-precedence.html: 22 * fast/dom/Window/window-lookup-precedence-expected.txt: 23 * fast/dom/Window/window-lookup-precedence.html: 24 * fast/dom/Window/window-properties-expected.txt: 25 * fast/dom/Window/window-properties.html: 26 * fast/dom/script-tests/prototype-inheritance.js: 27 Tweak tests so that showModalDialog part gets exercised only if its defined to keep output consistent across platforms. 28 Where its not possible, skip the test for showModalDialog, which is not currently exercised anyway. 29 30 * fast/events/resources/modal-dialog.html: Added. 31 * fast/events/show-modal-dialog-onblur-onfocus-expected.txt: Added. 32 * fast/events/show-modal-dialog-onblur-onfocus.html: Added. 33 * fast/harness/resources/modal-dialog.html: Added. 34 * fast/harness/show-modal-dialog-expected.txt: Added. 35 * fast/harness/show-modal-dialog.html: Added. 36 New tests that take advantage of showModalDialog in DRT. 37 38 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T1-expected.txt: 39 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T10-expected.txt: 40 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T11-expected.txt: 41 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T2-expected.txt: 42 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T3-expected.txt: 43 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T4-expected.txt: 44 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T5-expected.txt: 45 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T6-expected.txt: 46 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T7-expected.txt: 47 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T8-expected.txt: 48 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T9-expected.txt: 49 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T1-expected.txt: 50 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T10-expected.txt: 51 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T11-expected.txt: 52 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T2-expected.txt: 53 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T3-expected.txt: 54 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T4-expected.txt: 55 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T5-expected.txt: 56 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T6-expected.txt: 57 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T7-expected.txt: 58 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T8-expected.txt: 59 * fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9-expected.txt: 60 Update the expected output to reflect the fact that these tests pass now. Skip the tests on gtk, qt and win. They were all expected 61 to fail anyway. So no coverage lost. 62 63 * http/tests/security/cross-frame-access-call-expected.txt: 64 * http/tests/security/cross-frame-access-call.html: 65 * http/tests/security/cross-frame-access-get-expected.txt: 66 * http/tests/security/cross-frame-access-get.html: 67 * http/tests/security/cross-frame-access-put-expected.txt: 68 Skip showModalDialog to make test pass for all platforms. Added a FIXME with bug # to add a test specifically for showModalDialog. 69 70 * http/tests/security/resources/cross-frame-iframe-for-put-test.html: 71 * platform/chromium-mac/fast/dom/Window/window-function-frame-getter-precedence-expected.txt: Removed. 72 * platform/chromium-mac/fast/dom/Window/window-function-name-getter-precedence-expected.txt: Removed. 73 * platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt: 74 * platform/chromium-win/fast/dom/Window/window-function-frame-getter-precedence-expected.txt: Removed. 75 * platform/chromium-win/fast/dom/Window/window-function-name-getter-precedence-expected.txt: Removed. 76 * platform/chromium-win/fast/dom/Window/window-lookup-precedence-expected.txt: 77 * platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt: 78 * platform/chromium-win/http/tests/security/cross-frame-access-put-expected.txt: 79 * platform/chromium/http/tests/security/cross-frame-access-call-expected.txt: 80 * platform/chromium/test_expectations.txt: 81 * platform/gtk/Skipped: 82 * platform/qt/Skipped: 83 * platform/qt/fast/dom/Window/window-function-frame-getter-precedence-expected.txt: Removed. 84 * platform/qt/fast/dom/Window/window-function-name-getter-precedence-expected.txt: Removed. 85 * platform/qt/fast/dom/Window/window-lookup-precedence-expected.txt: Removed. 86 Updaate expected output to reflect test changes. Removed some platform specific files where the only reason they're different is 87 because of showModalDialog. 88 89 * platform/qt/http/tests/security/cross-frame-access-call-expected.txt: 90 * platform/qt/http/tests/security/cross-frame-access-get-expected.txt: 91 * platform/win/Skipped: 92 Skip failing tests. Note that there is no test functionality lost. These are either new tests or tests that were dysfunctional anyway 93 in the absence of showModalDialog in DRT. 94 1 95 2010-06-21 Chris Fleizach <cfleizach@apple.com> 2 96 -
trunk/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence-expected.txt
r61564 r61599 31 31 PASS: typeof window.addEventListener should be object and is. 32 32 PASS: typeof window.removeEventListener should be object and is. 33 FAIL: typeof window.showModalDialog should be object but instead is undefined34 33 PASS: typeof window.captureEvents should be object and is. 35 34 PASS: typeof window.releaseEvents should be object and is. -
trunk/LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html
r61564 r61599 17 17 } 18 18 19 function shouldBe(a, b )19 function shouldBe(a, b, printOnlyOnFailure) 20 20 { 21 21 var evalA; … … 25 25 evalA = e; 26 26 } 27 if (evalA == b) 28 log("PASS: " + a + " should be " + b + " and is.", "green"); 29 else 27 if (evalA == b) { 28 if (!printOnlyOnFailure) 29 log("PASS: " + a + " should be " + b + " and is.", "green"); 30 } else 30 31 log("FAIL: " + a + " should be " + b + " but instead is " + evalA, "red"); 31 32 } … … 38 39 document.body.appendChild(iframe); 39 40 40 shouldBe("typeof window." + functionName, "object"); 41 // showModalDialog only works on mac in the DRT. So run this test only if its defined and print output only on failure. 42 // This'll keep the output consistent on all platforms. 43 if (functionName == "showModalDialog") { 44 if (window.showModalDialog != undefined) 45 shouldBe("typeof window." + functionName, "object", true); 46 } else 47 shouldBe("typeof window." + functionName, "object"); 41 48 42 49 document.body.removeChild(iframe); -
trunk/LayoutTests/fast/dom/Window/window-function-name-getter-precedence-expected.txt
r61564 r61599 31 31 PASS: typeof window.addEventListener should be function and is. 32 32 PASS: typeof window.removeEventListener should be function and is. 33 FAIL: typeof window.showModalDialog should be function but instead is undefined34 33 PASS: typeof window.captureEvents should be function and is. 35 34 PASS: typeof window.releaseEvents should be function and is. -
trunk/LayoutTests/fast/dom/Window/window-function-name-getter-precedence.html
r61564 r61599 17 17 } 18 18 19 function shouldBe(a, b )19 function shouldBe(a, b, printOnlyOnFailure) 20 20 { 21 21 var evalA; … … 25 25 evalA = e; 26 26 } 27 if (evalA == b) 28 log("PASS: " + a + " should be " + b + " and is.", "green"); 29 else 27 if (evalA == b) { 28 if (!printOnlyOnFailure) 29 log("PASS: " + a + " should be " + b + " and is.", "green"); 30 } else 30 31 log("FAIL: " + a + " should be " + b + " but instead is " + evalA, "red"); 31 32 } … … 37 38 document.body.appendChild(element); 38 39 39 shouldBe("typeof window." + functionName, "function"); 40 // showModalDialog only works on mac in the DRT. So run this test only if its defined and print output only on failure. 41 // This'll keep the output consistent on all platforms. 42 if (functionName == "showModalDialog") { 43 if (window.showModalDialog != undefined) 44 shouldBe("typeof window." + functionName, "function", true); 45 } else 46 shouldBe("typeof window." + functionName, "function"); 40 47 41 48 document.body.removeChild(element); -
trunk/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt
r61564 r61599 61 61 PASS 'function setTimeout() { [native code]}' is 'function setTimeout() { [native code]}' 62 62 PASS 'function setTimeout() { [native code]}' is 'function setTimeout() { [native code]}' 63 FAIL win['showModalDialog'] should be null (of type object). Was undefined (of type undefined).64 FAIL win['showModalDialog'] should be null (of type object). Was undefined (of type undefined).65 63 PASS 'function stop() { [native code]}' is 'function stop() { [native code]}' 66 64 PASS 'function stop() { [native code]}' is 'function stop() { [native code]}' -
trunk/LayoutTests/fast/dom/Window/window-lookup-precedence.html
r61564 r61599 39 39 var name = prop[0]; 40 40 var original = win[name]; 41 // showModalDialog is not currently implemented in DumpRenderTree for all platforms. 42 if (name == "showModalDialog") 43 return; 41 44 // Check subframe precedence. 42 45 try { -
trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt
r61586 r61599 2264 2264 window.setInterval [function] 2265 2265 window.setTimeout [function] 2266 window.showModalDialog [undefined]2267 2266 window.status [string] 2268 2267 window.statusbar [object BarInfo] -
trunk/LayoutTests/fast/dom/Window/window-properties.html
r61564 r61599 84 84 "window.FileError" : 1, 85 85 "window.FileReader" : 1, 86 "window.ondeviceorientation" : 1 86 "window.ondeviceorientation" : 1, 87 88 // showModalDialog is not implemented on all platforms in DumpRenderTree. 89 "window.showModalDialog" : 1 87 90 }; 88 91 -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
r61564 r61599 20 20 "Int8Array", "Uint8Array", "Int16Array", "Uint16Array", "Int32Array", "Uint32Array", "Float32Array", 21 21 "FileError", "FileReader", 22 "indexedDB" 22 "indexedDB", "showModalDialog" 23 23 ]; 24 24 -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T1-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T1 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T10-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T10 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T11-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T11 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T2-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T2 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T3-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T3 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T4-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T4 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T5-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T5 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T6-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T6 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T7-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T7 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T8-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T8 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T9-expected.txt
r61564 r61599 1 1 S10.2.2_A1.1_T9 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T1-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T1 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T10-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T10 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T11-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T11 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T2-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T2 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T3-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T3 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T4-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T4 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T5-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T5 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T6-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T6 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T7-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T7 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T8-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T8 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9-expected.txt
r61564 r61599 1 1 S10.2.2_A1.2_T9 2 2 3 FAIL SputnikError: #1: scope chain must contain same objects in the same order as the calling context 3 PASS 4 4 5 5 TEST COMPLETE -
trunk/LayoutTests/http/tests/security/cross-frame-access-call-expected.txt
r61564 r61599 83 83 PASS: window.resizeBy.call(targetWindow, 0, 0); should be 'undefined' and is. 84 84 PASS: window.resizeTo.call(targetWindow, 0, 0); should be 'undefined' and is. 85 PASS: window.showModalDialog.call(targetWindow); should be 'TypeError: Result of expression 'window.showModalDialog' [undefined] is not an object.' and is.86 85 PASS: window.location.toString.call(targetWindow.location) should be 'undefined' and is. 87 86 -
trunk/LayoutTests/http/tests/security/cross-frame-access-call.html
r61564 r61599 56 56 shouldBe("window.resizeTo.call(targetWindow, 0, 0);", "undefined"); 57 57 58 // FIXME: showModalDialog now works on DRT and thus breaks this test. Will uncomment after adding a separate test for Mac for showModalDialog - Bug #39897 58 59 // Throws a TypeError and logs to the error console 59 shouldBe("window.showModalDialog.call(targetWindow);", '"TypeError: Result of expression \'window.showModalDialog\' [undefined] is not an object."');60 // shouldBe("window.showModalDialog.call(targetWindow);", '"TypeError: Result of expression \'window.showModalDialog\' [undefined] is not an object."'); 60 61 61 62 // - Tests for the Location object - -
trunk/LayoutTests/http/tests/security/cross-frame-access-get-expected.txt
r61564 r61599 534 534 PASS: canGet('targetWindow.setInterval') should be 'false' and is. 535 535 PASS: canGet('targetWindow.setTimeout') should be 'false' and is. 536 PASS: canGet('targetWindow.showModalDialog') should be 'false' and is.537 536 PASS: canGet('targetWindow.stop') should be 'false' and is. 538 537 -
trunk/LayoutTests/http/tests/security/cross-frame-access-get.html
r61564 r61599 133 133 "setInterval", 134 134 "setTimeout", 135 "showModalDialog", 135 // FIXME: This function is now implemented on mac and hence the expected output changes. Uncomment after adding a 136 // mac specific test for showModalDialog. Bug# 39897 137 // "showModalDialog", 136 138 "stop" 137 139 ]; -
trunk/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
r61564 r61599 563 563 ALERT: PASS: window.setInterval should be 'function setInterval() { [native code]}' and is. 564 564 ALERT: PASS: window.setTimeout should be 'function setTimeout() { [native code]}' and is. 565 ALERT: PASS: window.showModalDialog should be 'undefined' and is.565 ALERT: PASS: window.showModalDialog matched the expected value. 566 566 ALERT: PASS: window.stop should be 'function stop() { [native code]}' and is. 567 567 This test checks cross-frame access security of window attribute setters (rdar://problem/5326791). -
trunk/LayoutTests/http/tests/security/resources/cross-frame-iframe-for-put-test.html
r61564 r61599 460 460 shouldBe("window.setInterval", "setIntervalOld"); 461 461 shouldBe("window.setTimeout", "setTimeoutOld"); 462 shouldBe("window.showModalDialog", "showModalDialogOld"); 462 463 // showModalDialog is not implemented on all platforms for DumpRenderTree. So don't display the values. 464 shouldBe("window.showModalDialog", "showModalDialogOld", true); 463 465 shouldBe("window.stop", "stopOld"); 464 466 }, 0); -
trunk/LayoutTests/platform/chromium-mac/http/tests/security/cross-frame-access-get-expected.txt
r56251 r61599 1 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-get.html. Domains, protocols and ports must match.2 3 1 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-get.html. Domains, protocols and ports must match. 4 2 … … 536 534 PASS: canGet('targetWindow.setInterval') should be 'false' and is. 537 535 PASS: canGet('targetWindow.setTimeout') should be 'false' and is. 538 PASS: canGet('targetWindow.showModalDialog') should be 'false' and is.539 536 PASS: canGet('targetWindow.stop') should be 'false' and is. 540 537 -
trunk/LayoutTests/platform/chromium-win/fast/dom/Window/window-lookup-precedence-expected.txt
r56267 r61599 61 61 PASS 'function setTimeout() { [native code] }' is 'function setTimeout() { [native code] }' 62 62 PASS 'function setTimeout() { [native code] }' is 'function setTimeout() { [native code] }' 63 PASS 'function showModalDialog() { [native code] }' is 'function showModalDialog() { [native code] }'64 PASS 'function showModalDialog() { [native code] }' is 'function showModalDialog() { [native code] }'65 63 PASS 'function stop() { [native code] }' is 'function stop() { [native code] }' 66 64 PASS 'function stop() { [native code] }' is 'function stop() { [native code] }' -
trunk/LayoutTests/platform/chromium-win/http/tests/security/cross-frame-access-get-expected.txt
r56271 r61599 1 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-get.html. Domains, protocols and ports must match.2 3 1 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-get.html. Domains, protocols and ports must match. 4 2 … … 536 534 PASS: canGet('targetWindow.setInterval') should be 'false' and is. 537 535 PASS: canGet('targetWindow.setTimeout') should be 'false' and is. 538 PASS: canGet('targetWindow.showModalDialog') should be 'false' and is.539 536 PASS: canGet('targetWindow.stop') should be 'false' and is. 540 537 -
trunk/LayoutTests/platform/chromium-win/http/tests/security/cross-frame-access-put-expected.txt
r56271 r61599 571 571 ALERT: PASS: window.setInterval should be 'function () { [native code] }' and is. 572 572 ALERT: PASS: window.setTimeout should be 'function () { [native code] }' and is. 573 ALERT: PASS: window.showModalDialog should be 'function () { [native code] }' and is.573 ALERT: PASS: window.showModalDialog matched the expected value. 574 574 ALERT: PASS: window.stop should be 'function () { [native code] }' and is. 575 575 This test checks cross-frame access security of window attribute setters (rdar://problem/5326791). -
trunk/LayoutTests/platform/chromium/http/tests/security/cross-frame-access-call-expected.txt
r59126 r61599 1 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.2 3 1 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. 4 2 … … 85 83 PASS: window.resizeBy.call(targetWindow, 0, 0); should be 'undefined' and is. 86 84 PASS: window.resizeTo.call(targetWindow, 0, 0); should be 'undefined' and is. 87 *** FAIL: window.showModalDialog.call(targetWindow); should be 'TypeError: Result of expression 'window.showModalDialog' [undefined] is not an object.' but instead is undefined. ***88 85 PASS: window.location.toString.call(targetWindow.location) should be 'undefined' and is. -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r61573 r61599 2876 2876 BUG47083 : fast/text/hyphenate-character.html = IMAGE+TEXT 2877 2877 BUG47083 : fast/text/hyphens.html = IMAGE+TEXT 2878 2879 // Related to https://bugs.webkit.org/show_bug.cgi?id=35350 2880 BUG45048 : fast/events/show-modal-dialog-onblur-onfocus.html = FAIL 2881 BUG45048 : fast/harness/show-modal-dialog.html = FAIL -
trunk/LayoutTests/platform/gtk/Skipped
r61586 r61599 5900 5900 # https://bugs.webkit.org/show_bug.cgi?id=40859 5901 5901 media/video-controls-rendering.html 5902 5903 # https://bugs.webkit.org/show_bug.cgi?id=35350 5904 fast/events/show-modal-dialog-onblur-onfocus.html 5905 fast/harness/show-modal-dialog.html 5906 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T10.html 5907 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T11.html 5908 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T2.html 5909 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T2.html 5910 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T4.html 5911 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T4.html 5912 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T6.html 5913 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T6.html 5914 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T8.html 5915 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T8.html 5916 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T10.html 5917 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T11.html 5918 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T1.html 5919 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T1.html 5920 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T3.html 5921 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T3.html 5922 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T5.html 5923 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T5.html 5924 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T7.html 5925 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T7.html 5926 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T9.html 5927 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9.html -
trunk/LayoutTests/platform/qt/Skipped
r61586 r61599 5414 5414 # preloader tests. 5415 5415 fast/preloader 5416 5417 # https://bugs.webkit.org/show_bug.cgi?id=35350 5418 fast/events/show-modal-dialog-onblur-onfocus.html 5419 fast/harness/show-modal-dialog.html 5420 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T10.html 5421 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T11.html 5422 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T2.html 5423 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T2.html 5424 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T4.html 5425 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T4.html 5426 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T6.html 5427 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T6.html 5428 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T8.html 5429 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T8.html 5430 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T10.html 5431 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T11.html 5432 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T1.html 5433 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T1.html 5434 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T3.html 5435 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T3.html 5436 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T5.html 5437 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T5.html 5438 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T7.html 5439 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T7.html 5440 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T9.html 5441 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9.html -
trunk/LayoutTests/platform/qt/http/tests/security/cross-frame-access-call-expected.txt
r59122 r61599 1 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.2 3 1 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. 4 2 … … 85 83 PASS: window.resizeBy.call(targetWindow, 0, 0); should be 'undefined' and is. 86 84 PASS: window.resizeTo.call(targetWindow, 0, 0); should be 'undefined' and is. 87 *** FAIL: window.showModalDialog.call(targetWindow); should be 'TypeError: Result of expression 'window.showModalDialog' [undefined] is not an object.' but instead is undefined. ***88 85 PASS: window.location.toString.call(targetWindow.location) should be 'undefined' and is. 89 86 -
trunk/LayoutTests/platform/qt/http/tests/security/cross-frame-access-get-expected.txt
r54568 r61599 1 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-get.html. Domains, protocols and ports must match.2 3 1 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-get.html. Domains, protocols and ports must match. 4 2 … … 536 534 PASS: canGet('targetWindow.setInterval') should be 'false' and is. 537 535 PASS: canGet('targetWindow.setTimeout') should be 'false' and is. 538 PASS: canGet('targetWindow.showModalDialog') should be 'false' and is.539 536 PASS: canGet('targetWindow.stop') should be 'false' and is. 540 537 -
trunk/LayoutTests/platform/win/Skipped
r61586 r61599 903 903 fast/text/hyphenate-character.html 904 904 fast/text/hyphens.html 905 906 # https://bugs.webkit.org/show_bug.cgi?id=35350 907 fast/events/show-modal-dialog-onblur-onfocus.html 908 fast/harness/show-modal-dialog.html 909 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T10.html 910 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T11.html 911 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T2.html 912 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T2.html 913 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T4.html 914 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T4.html 915 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T6.html 916 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T6.html 917 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T8.html 918 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T8.html 919 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T10.html 920 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T11.html 921 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T1.html 922 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T1.html 923 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T3.html 924 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T3.html 925 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T5.html 926 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T5.html 927 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T7.html 928 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T7.html 929 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T9.html 930 fast/js/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9.html -
trunk/WebKitTools/ChangeLog
r61583 r61599 1 2010-06-21 Prasad Tammana <prasadt@chromium.org> 2 3 Reviewed by Darin Adler, Dmitry Titov. 4 5 DumpRenderTree should allow tests with modal dialogs 6 https://bugs.webkit.org/show_bug.cgi?id=35350 7 8 * DumpRenderTree/LayoutTestController.cpp: 9 (abortModalCallback): 10 (LayoutTestController::staticFunctions): 11 * DumpRenderTree/LayoutTestController.h: 12 * DumpRenderTree/mac/LayoutTestControllerMac.mm: 13 (LayoutTestController::abortModal): 14 Add abortModal method to LayoutTestController and make it available from script. 15 16 * DumpRenderTree/mac/UIDelegate.mm: Add support for showModalDialog. 17 (-[UIDelegate modalWindowWillClose:]): Observer for NSWindowWillCloseNotifications to call 18 abortModal from when modal window closes. 19 (-[UIDelegate webViewRunModal:]): Delegate method for showModalDialog to run the modal loop. 20 1 21 2010-06-21 Simon Fraser <simon.fraser@apple.com> 2 22 -
trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp
r61564 r61599 1474 1474 } 1475 1475 1476 1477 #if PLATFORM(MAC) 1478 static JSValueRef abortModalCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) 1479 { 1480 LayoutTestController* controller = static_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject)); 1481 controller->abortModal(); 1482 return JSValueMakeUndefined(context); 1483 } 1484 #endif 1485 1476 1486 static JSValueRef markerTextForListItemCallback(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) 1477 1487 { … … 1600 1610 { 1601 1611 static JSStaticFunction staticFunctions[] = { 1612 #if PLATFORM(MAC) 1613 { "abortModal", abortModalCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1614 #endif 1602 1615 { "addDisallowedURL", addDisallowedURLCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, 1603 1616 { "addUserScript", addUserScriptCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, -
trunk/WebKitTools/DumpRenderTree/LayoutTestController.h
r61564 r61599 258 258 void setWebViewEditable(bool); 259 259 260 261 #if PLATFORM(MAC) 262 void abortModal(); 263 #endif 264 260 265 // The following API test functions should probably be moved to platform-specific 261 266 // unit tests outside of DRT once they exist. -
trunk/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
r61564 r61599 867 867 [editingBehaviorNS release]; 868 868 } 869 870 void LayoutTestController::abortModal() 871 { 872 [NSApp abortModal]; 873 } -
trunk/WebKitTools/DumpRenderTree/mac/UIDelegate.mm
r61564 r61599 66 66 67 67 printf ("CONSOLE MESSAGE: line %d: %s\n", [lineNumber intValue], [message UTF8String]); 68 } 69 70 - (void)modalWindowWillClose:(NSNotification *)notification 71 { 72 [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowWillCloseNotification object:nil]; 73 [NSApp abortModal]; 74 } 75 76 - (void)webViewRunModal:(WebView *)sender 77 { 78 gLayoutTestController->setWindowIsKey(false); 79 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modalWindowWillClose:) name:NSWindowWillCloseNotification object:nil]; 80 [NSApp runModalForWindow:[sender window]]; 81 gLayoutTestController->setWindowIsKey(true); 68 82 } 69 83
Note: See TracChangeset
for help on using the changeset viewer.