diff options
author | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 02:59:21 +0000 |
---|---|---|
committer | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 02:59:21 +0000 |
commit | 0f7a0191f603800bbf7e387277ed29a6209063bc (patch) | |
tree | 3037a845548ae2c1b2758546a3af3eb4898e391a | |
parent | 07f54fcc277a2d8fc3e6cecc5df5ea5c3d5ed080 (diff) | |
download | chromium_src-0f7a0191f603800bbf7e387277ed29a6209063bc.zip chromium_src-0f7a0191f603800bbf7e387277ed29a6209063bc.tar.gz chromium_src-0f7a0191f603800bbf7e387277ed29a6209063bc.tar.bz2 |
Remove tests that have been upstreamed:
- chrome/fast/dom/xss-DENIED-javascript-variations , r52461
- chrome/fast/js/document-clear upstreamed as fast/dom/document-clear.html,
r52408
- chrome/fast/text/fake-italic as fast/text/fake-italic, r52407
- chrome/http/tests/security/xss-DENIED-assign-location-href-javascript as
http/tests/..., r52301
- chrome/plugins/get-file-url, r52410
- chrome/plugins/get-url-with-iframe-target.html, r52410
- chrome/plugins/call-as-function.html
- under platforms/chromium/plugins, r52472
- chrome/plugins/get-url-with-iframe-target-no-crash.html
- under platforms/chromium/plugins, r52472
- chrome/plugins/multiple-plugins.html
- under platforms/chromium/plugins, r52472
- chrome/plugins/nested-plugin-objects.html
- under platforms/chromium/plugins, r52472
- chrome/plugins/refcount-leaks.html
- under platforms/chromium/plugins, r52472
- chrome/plugins/return-npobject.html
- under platforms/chromium/plugins, r52472
- chrome/plugins/script-object-invoke.html
- under platforms/chromium/plugins, r52472
- chrome/svg/custom/new-image-is-html-element, r52408
BUG=30503
R=pkasting@chromium.org
TEST=chrome/fast/dom/xss-DENIED-javascript-variations.html
TEST=chrome/fast/js/document-clear.html
TEST=chrome/fast/text/fake-italic.html
TEST=chrome/http/tests/security/xss-DENIED-assign-location-href-javascript.html
TEST=chrome/plugins/call-as-function.html
TEST=chrome/plugins/get-file-url.html
TEST=chrome/plugins/get-url-with-iframe-target-no-crash.html
TEST=chrome/plugins/get-url-with-iframe-target.html
TEST=chrome/plugins/multiple-plugins.html
TEST=chrome/plugins/nested-plugin-objects.html
TEST=chrome/plugins/refcount-leaks.html
TEST=chrome/plugins/return-npobject.html
TEST=chrome/plugins/script-object-invoke.html
TEST=chrome/svg/custom/new-image-is-html-element.html
Review URL: http://codereview.chromium.org/504079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35136 0039d316-1c4b-4281-b951-d872f2087c98
44 files changed, 1 insertions, 721 deletions
diff --git a/webkit/data/layout_tests/chrome/fast/dom/xss-DENIED-javascript-variations-expected.txt b/webkit/data/layout_tests/chrome/fast/dom/xss-DENIED-javascript-variations-expected.txt deleted file mode 100644 index 3f9b480..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/xss-DENIED-javascript-variations-expected.txt +++ /dev/null @@ -1,31 +0,0 @@ -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>Inner text should not be replaced.<p> from frame with URL xss-DENIED-javascript-variations.html. Domains, protocols and ports must match. - - - - --------- -Frame: 'DUPA' --------- -Inner text should not be replaced. diff --git a/webkit/data/layout_tests/chrome/fast/dom/xss-DENIED-javascript-variations.html b/webkit/data/layout_tests/chrome/fast/dom/xss-DENIED-javascript-variations.html deleted file mode 100644 index f34ffea..0000000 --- a/webkit/data/layout_tests/chrome/fast/dom/xss-DENIED-javascript-variations.html +++ /dev/null @@ -1,37 +0,0 @@ -<html> -<head> -<script> -if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.dumpChildFramesAsText(); -} - -function runTest() { - var a = window.frames[0]; -// java\0script is invalid url. - - a.location.href = " javascript:document.write('FAIL')"; - a.location.href = "javascript\t:document.write('FAIL')"; - a.location.href = "javascript\1:document.write('FAIL')"; - a.location.href = "javascript:document.write('FAIL')"; - - - a.location.replace(" javascript:document.write('FAIL')"); - a.location.replace("javascript\t:document.write('FAIL')"); - a.location.replace("javascript\1:document.write('FAIL')"); - a.location.replace("javascript:document.write('FAIL')"); - - a.location = " javascript:document.write('FAIL')"; - a.location = "javascript\t:document.write('FAIL')"; - a.location = "javascript\1:document.write('FAIL')"; - a.location = "javascript:document.write('FAIL')"; -} -</script> - -</head> -<body onload="runTest()"> -<br> -<iframe id = 'DUPA' src="data:text/html,<p>Inner text should not be replaced.<p>"></iframe> - -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/fast/js/document-clear-expected.txt b/webkit/data/layout_tests/chrome/fast/js/document-clear-expected.txt deleted file mode 100644 index 8df8b45..0000000 --- a/webkit/data/layout_tests/chrome/fast/js/document-clear-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -Original line 1 - -New line 1 - -Calling document.clear() from an external script should not crash. - -If successful, there will be 4 lines total diff --git a/webkit/data/layout_tests/chrome/fast/js/document-clear.html b/webkit/data/layout_tests/chrome/fast/js/document-clear.html deleted file mode 100644 index 3020c48..0000000 --- a/webkit/data/layout_tests/chrome/fast/js/document-clear.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> - <p>Original line 1</p> - <script src="resources/document-clear.js"></script> - <p>Calling document.clear() from an external script should not crash.</p> - <script> - if (window.layoutTestController) - layoutTestController.dumpAsText(); - </script> - <p>If successful, there will be 4 lines total</p> -</html> diff --git a/webkit/data/layout_tests/chrome/fast/text/fake-italic.html b/webkit/data/layout_tests/chrome/fast/text/fake-italic.html deleted file mode 100644 index 1e9dbd5..0000000 --- a/webkit/data/layout_tests/chrome/fast/text/fake-italic.html +++ /dev/null @@ -1,11 +0,0 @@ -<html> - <head> - <title>Fake italic layout test</title> - </head> - - <body> - <p>This layout test is designed to test that our fake italic mode is working correctly. The Ahem font, used below, does not include an italic variant. Thus, when we ask for italic Ahem, we should skew the glyphs ourselves, resulting in a series of italic black boxes below.</p> - - <p style="font-family: Ahem; font-style: italic;">A A A A</p> - </body> -</html> diff --git a/webkit/data/layout_tests/chrome/http/tests/security/resources/localPage.html b/webkit/data/layout_tests/chrome/http/tests/security/resources/localPage.html deleted file mode 100644 index 7bcdf1f..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/security/resources/localPage.html +++ /dev/null @@ -1,4 +0,0 @@ -<html> - -<body> A local page</body> -</html> diff --git a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.checksum b/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.checksum deleted file mode 100644 index 66c2727..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -a7489da9028f26924122a873a7da1dad
\ No newline at end of file diff --git a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.png b/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.png Binary files differdeleted file mode 100644 index 74eeb0c..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt b/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt deleted file mode 100644 index 3222dd6..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8081/chrome/http/tests/security/resources/localPage.html from frame with URL http://127.0.0.1:8081/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript.html. Domains, protocols and ports must match. - - - --------- -Frame: '<!--framePath //<!--frame0-->-->' --------- -A local page diff --git a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript.html b/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript.html deleted file mode 100644 index e54d17c..0000000 --- a/webkit/data/layout_tests/chrome/http/tests/security/xss-DENIED-assign-location-href-javascript.html +++ /dev/null @@ -1,16 +0,0 @@ -<html> -<script> -if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.dumpChildFramesAsText(); -} - -function runTest() { - frames[0].location.href = 'javascript:3'; -} - -</script> -<body onload="runTest()"> -<iframe src="http://localhost:8081/chrome/http/tests/security/resources/localPage.html"></iframe> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/plugins/call-as-function-expected.txt b/webkit/data/layout_tests/chrome/plugins/call-as-function-expected.txt deleted file mode 100644 index 862f350..0000000 --- a/webkit/data/layout_tests/chrome/plugins/call-as-function-expected.txt +++ /dev/null @@ -1,4 +0,0 @@ -This tests that call a plugin object (NPObject) as a function invokes invokeDefault() function on the object. - -plg() = 1 -plg.testObject() = 2 diff --git a/webkit/data/layout_tests/chrome/plugins/call-as-function.html b/webkit/data/layout_tests/chrome/plugins/call-as-function.html deleted file mode 100644 index 7ed61ee..0000000 --- a/webkit/data/layout_tests/chrome/plugins/call-as-function.html +++ /dev/null @@ -1,25 +0,0 @@ -<html> -<script> -if (window.layoutTestController) - layoutTestController.dumpAsText(); - -function runTest() { - var c = document.getElementById('console'); - var p = document.getElementById('plg'); - var x = p(); - c.innerHTML += 'plg() = ' + x + '<br>'; - - var y = p.testObject(); - c.innerHTML += 'plg.testObject() = ' + y + '<br>'; -} -</script> -<body onload='runTest()'> -<embed id="plg" type="application/x-webkit-test-netscape"></embed><P> - -This tests that call a plugin object (NPObject) as a function invokes -invokeDefault() function on the object. - -<div id="console"></div> -</body> -</html> - diff --git a/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.checksum b/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.checksum deleted file mode 100644 index 0a7f12a..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -a6830a96cdc578d7c442ae198cdddadd
\ No newline at end of file diff --git a/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.png b/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.png Binary files differdeleted file mode 100644 index 86d20e7..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.txt b/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.txt deleted file mode 100644 index 27d9e98..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-file-url-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -This tests that file URLs can embed plugins which can successfully load other File URLs from the Plugin. (Via the NPN_GetURL API) - -SUCCESS diff --git a/webkit/data/layout_tests/chrome/plugins/get-file-url.html b/webkit/data/layout_tests/chrome/plugins/get-file-url.html deleted file mode 100644 index f5f03e1..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-file-url.html +++ /dev/null @@ -1,41 +0,0 @@ -<html> -<body> -<embed id="plg" type="application/x-webkit-test-netscape"></embed><P> - -This tests that file URLs can embed plugins which can successfully -load other File URLs from the Plugin. (Via the NPN_GetURL API) - -<div id="result">FAILED</div> -<iframe name="output">Output Goes Here</iframe> - -<script> -function CheckForFinished() { - if (window.subframe_done == 1) { - var result = document.getElementById("result"); - result.innerHTML = "SUCCESS"; - if (layoutTestController) { - layoutTestController.notifyDone(); - } - } else { - setTimeout(CheckForFinished, 10); - } -} - -function runtest() { - window.subframe_done = 0; - var loc = window.location.toString(); - var subfile = loc.replace(/get-file-url.html/,"resources/get-file-url-subframe.html"); - var plg = document.getElementById("plg"); - plg.getURL(subfile, "output"); - setTimeout(CheckForFinished, 10); -} - -if (layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); -} -runtest(); -</script> -</body> -</html> - diff --git a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-expected.txt b/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-expected.txt deleted file mode 100644 index 2499c66..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ - This tests that the plugin properly receives NPP_URLNotify for subframe loads. -SUCCESS - diff --git a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-no-crash-expected.txt b/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-no-crash-expected.txt deleted file mode 100644 index 64edcc7..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-no-crash-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -This tests that we do not crash upon trying to deliver NPP_URLNotify to a plugin that has been deleted. -SUCCESS - diff --git a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-no-crash.html b/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-no-crash.html deleted file mode 100644 index 35d1a09..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target-no-crash.html +++ /dev/null @@ -1,21 +0,0 @@ -<html> -<script> -function runtest() { - if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); - plg.getURLNotify("data:text/html,<body onload='layoutTestController.notifyDone()'></body>", "frame", "callback"); - plg.parentNode.removeChild(plg) - } else { - document.write("Cannot run interactively"); - } -} -</script> -<body onload="runtest()"> -<embed id="plg" type="application/x-webkit-test-netscape"></embed> -This tests that we do not crash upon trying to deliver NPP_URLNotify to -a plugin that has been deleted. -<div id="result">SUCCESS</div> -<iframe id="frame"></iframe> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target.html b/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target.html deleted file mode 100644 index b984540..0000000 --- a/webkit/data/layout_tests/chrome/plugins/get-url-with-iframe-target.html +++ /dev/null @@ -1,33 +0,0 @@ -<html> -<script> -var NPERR_NO_ERROR = 0; -var NPERR_GENERIC_ERROR = 1; - -function callback(result) { - var d = document.getElementById('result'); - - if (result == NPERR_NO_ERROR) - d.innerHTML = "SUCCESS" - else - d.innerHTML = "FAILED - got error code " + result - - layoutTestController.notifyDone(); -} - -function runtest() { - if (window.layoutTestController) { - layoutTestController.dumpAsText(); - layoutTestController.waitUntilDone(); - plg.getURLNotify("data:,hello world", "frame", "callback"); - } else { - document.write("Cannot run interactively"); - } -} -</script> -<body onload="runtest()"> -<embed id="plg" type="application/x-webkit-test-netscape"></embed> -This tests that the plugin properly receives NPP_URLNotify for subframe loads. -<div id="result">FAILED</div> -<iframe id="frame"></iframe> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/plugins/multiple-plugins-expected.txt b/webkit/data/layout_tests/chrome/plugins/multiple-plugins-expected.txt deleted file mode 100644 index 18445a5..0000000 --- a/webkit/data/layout_tests/chrome/plugins/multiple-plugins-expected.txt +++ /dev/null @@ -1,5 +0,0 @@ -Test that we can create two plugins, and independently clean each. Prints "SUCCESS" on success, "FAILURE" on failure. -Got testObj1 property -Got testObj2 property -Got testObj2 property -SUCCESS diff --git a/webkit/data/layout_tests/chrome/plugins/multiple-plugins.html b/webkit/data/layout_tests/chrome/plugins/multiple-plugins.html deleted file mode 100644 index 1f72026..0000000 --- a/webkit/data/layout_tests/chrome/plugins/multiple-plugins.html +++ /dev/null @@ -1,90 +0,0 @@ -<script> - function noop(x) { - } - - function doGC() { - if (window.gc) { - // GC twice to make sure everything is cleaned up. - for (var i = 0; i < 4; i++) { - window.gc(); - } - } - } - - function runtest() { - if (window.layoutTestController) - layoutTestController.dumpAsText(); - - doGC(); - - var plug1 = document.getElementById("plug1"); - var plug2 = document.getElementById("plug2"); - var output = document.getElementById("output"); - output.innerHTML = ""; - - var testObj1 = plug1.testObject; - var testObj2 = plug2.testObject; - - var successCount = 0; - - // Verify we can access each object. - if (testObj1.foo == "foo") { - successCount++; - output.innerHTML += "Got testObj1 property<br>"; - } - if (testObj2.foo == "foo") { - successCount++; - output.innerHTML += "Got testObj2 property<br>"; - } - - // Now remove the first plugin - plug1.parentNode.removeChild(plug1); - - try { - if (testObj1.foo == "foo") { - output.innerHTML = "Accessed nuked object!<br>"; - } - } catch (e) { - if (e instanceof ReferenceError) - successCount++; - } - - try { - if (testObj2.foo == "foo") { - successCount++; - output.innerHTML += "Got testObj2 property<br>"; - } - } catch(e) { - output.inerHTML += "Reference error accessing live object: " + e; - } - - // Now remove the second plugin - plug2.parentNode.removeChild(plug2); - - try { - if (testObj2.foo == "foo") { - output.innerHTML = "Accessed nuked object!<br>"; - } - } catch (e) { - if (e instanceof ReferenceError) - successCount++; - } - - var success = (successCount == 5); - output.innerHTML += (success ? "SUCCESS" : "FAILURE"); - } -</script> - -<body onload="runtest()"> - -Test that we can create two plugins, and independently clean each. - -Prints "SUCCESS" on success, "FAILURE" on failure. - -<embed id="plug1" type="application/x-webkit-test-netscape"> -<embed id="plug2" type="application/x-webkit-test-netscape"> - -<div id=output>FAILURE</div> - -</body> - diff --git a/webkit/data/layout_tests/chrome/plugins/nested-plugin-objects-expected.txt b/webkit/data/layout_tests/chrome/plugins/nested-plugin-objects-expected.txt deleted file mode 100644 index 08ba7b5..0000000 --- a/webkit/data/layout_tests/chrome/plugins/nested-plugin-objects-expected.txt +++ /dev/null @@ -1,17 +0,0 @@ -CONSOLE MESSAGE: line 29: PLUGIN: NPP_Destroy -This tests that objects from plugin objects are properly cleaned up. - -Example: - plugin - ------- (Creates) ------ Object1 - ------- (Creates) ------ Object2 - -It is important that both Object1 and Object2 cleanup as a result of -cleaning up the plugin. - -SUCCESS - - - - - diff --git a/webkit/data/layout_tests/chrome/plugins/nested-plugin-objects.html b/webkit/data/layout_tests/chrome/plugins/nested-plugin-objects.html deleted file mode 100644 index f0a66b1..0000000 --- a/webkit/data/layout_tests/chrome/plugins/nested-plugin-objects.html +++ /dev/null @@ -1,80 +0,0 @@ -<html> -<script> - -var callbackCount = 0; - -function npapiCallback(x) { - callbackCount++; -} - -function runTest() -{ - if (window.layoutTestController) - layoutTestController.dumpAsText(); - - var successCount = 0; - var plugin = document.getElementById("testPlugin"); - plugin.logDestroy = true; - - var testObject = plugin.testObject; - plugin.testPassTestObject("npapiCallback", testObject); - var testObject2 = testObject.testObject; - plugin.testPassTestObject("npapiCallback", testObject2); - var testObject3 = testObject2.testObject; - plugin.testPassTestObject("npapiCallback", testObject3); - - if (callbackCount == 3) - successCount++; - - plugin.parentNode.removeChild(plugin); - - try { - testObject.property; - } catch (e) { - if (e instanceof ReferenceError) - successCount++; - } - - try { - testObject.property = 'hello'; - } catch (e) { - if (e instanceof ReferenceError) - successCount++; - } - - try { - testObject2.property; - } catch (e) { - if (e instanceof ReferenceError) - successCount++; - } - - try { - testObject3.property; - } catch (e) { - if (e instanceof ReferenceError) - successCount++; - } - - if (successCount == 5) - document.getElementById('result').innerHTML = 'SUCCESS'; -} - -</script> - -<body onload="runTest();"> -<pre> -This tests that objects from plugin objects are properly cleaned up. - -Example: - plugin - ------- (Creates) ------ Object1 - ------- (Creates) ------ Object2 - -It is important that both Object1 and Object2 cleanup as a result of -cleaning up the plugin. - -<div id="result">FAILURE</div> -<embed id="testPlugin" type="application/x-webkit-test-netscape" width="200" height="200"></embed> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/plugins/refcount-leaks-expected.txt b/webkit/data/layout_tests/chrome/plugins/refcount-leaks-expected.txt deleted file mode 100644 index 3f76868..0000000 --- a/webkit/data/layout_tests/chrome/plugins/refcount-leaks-expected.txt +++ /dev/null @@ -1,14 +0,0 @@ -Test that we can get an NPObject returned through a method on an NPAPI Object. -Prints "SUCCESS" on success, "FAILURE" on failure. - ---- num test objects: -originally: 1 -after creation: 4 -after GC: 1 - ---- refcount on plug.testObject: -originally: 2 -after get: 2 -after GC: 2 -after passing: 2 -SUCCESS diff --git a/webkit/data/layout_tests/chrome/plugins/refcount-leaks.html b/webkit/data/layout_tests/chrome/plugins/refcount-leaks.html deleted file mode 100644 index 96e5117..0000000 --- a/webkit/data/layout_tests/chrome/plugins/refcount-leaks.html +++ /dev/null @@ -1,81 +0,0 @@ -<script> - function noop(x) { - } - - function doGC() { - if (window.gc) { - // GC twice to make sure everything is cleaned up. - for (var i = 0; i < 2; i++) { - window.gc(); - } - } - } - - function runtest() { - if (window.layoutTestController) - layoutTestController.dumpAsText(); - - - var output = document.getElementById("output"); - output.innerHTML = ""; - - // Test that objects are deleted after their JS references are released. - var countOrig = plug.testObjectCount; - o1 = plug.testCreateTestObject(); - o2 = plug.testCreateTestObject(); - o3 = plug.testCreateTestObject(); - var countAfterCreate = plug.testObjectCount; - o1 = o2 = o3 = null; - doGC(); - var countAfterGC = plug.testObjectCount; - - output.innerHTML += "--- num test objects:<br>"; - output.innerHTML += "originally: " + countOrig + "<br>"; - output.innerHTML += "after creation: " + countAfterCreate + "<br>"; - output.innerHTML += "after GC: " + countAfterGC + "<br>"; - output.innerHTML += "<br>"; - - // Test that the object refcount returns to normal after JS references - // are released. - var testObj = plug.testObject; - var refOrig = testObj.refCount; - var o1 = plug.testObject; - var o2 = plug.testObject; - var o3 = plug.testObject; - var refAfterGet = testObj.refCount; - o1 = o2 = o3 = null; - doGC(); - var refAfterGetGC = testObj.refCount; - - // Test that calling NPN_Invoke with our object as a parameter returns - // our refcount to normal (may require a GC). - plug.testPassTestObject("noop", testObj); - plug.testPassTestObject("noop", testObj); - plug.testPassTestObject("noop", testObj); - doGC(); - var refAfterPass = testObj.refCount; - - output.innerHTML += "--- refcount on plug.testObject:<br>"; - output.innerHTML += "originally: " + refOrig + "<br>"; - output.innerHTML += "after get: " + refAfterGet + "<br>"; - output.innerHTML += "after GC: " + refAfterGetGC + "<br>"; - output.innerHTML += "after passing: " + refAfterPass + "<br>"; - - var success = (countAfterGC == countOrig) && (refAfterPass == refOrig); - output.innerHTML += (success ? "SUCCESS" : "FAILURE"); - } -</script> - -<body onload="runtest()"> - -Test that we can get an NPObject returned through a method on -an NPAPI Object.<P> - -Prints "SUCCESS" on success, "FAILURE" on failure. - -<embed name="plug" type="application/x-webkit-test-netscape"> - -<div id=output>FAILURE</div> - -</body> - diff --git a/webkit/data/layout_tests/chrome/plugins/resources/get-file-url-subframe.html b/webkit/data/layout_tests/chrome/plugins/resources/get-file-url-subframe.html deleted file mode 100644 index b344691..0000000 --- a/webkit/data/layout_tests/chrome/plugins/resources/get-file-url-subframe.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<body> -Subframe loaded. - -<script> -window.parent.subframe_done = 1; -</script> - -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.checksum b/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.checksum deleted file mode 100644 index caf861c..0000000 --- a/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -cbed7004f3e8f16ca14031f6143e69a9
\ No newline at end of file diff --git a/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.png b/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.png Binary files differdeleted file mode 100644 index 2d86892..0000000 --- a/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.txt b/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.txt deleted file mode 100644 index 3d40ffa..0000000 --- a/webkit/data/layout_tests/chrome/plugins/return-npobject-expected.txt +++ /dev/null @@ -1,16 +0,0 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (8,8) size 784x584 - RenderBlock (anonymous) at (0,0) size 784x18 - RenderText {#text} at (0,0) size 523x18 - text run at (0,0) width 523: "Test that we can get an NPObject returned through a method on an NPAPI Object." - RenderBlock {P} at (0,34) size 784x154 - RenderText {#text} at (0,136) size 359x18 - text run at (0,136) width 359: "Prints \"SUCCESS\" on success, \"FAILURE\" on failure. " - RenderPartObject {EMBED} at (359,0) size 300x150 - RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (0,204) size 784x18 - RenderText {#text} at (0,0) size 71x18 - text run at (0,0) width 71: "SUCCESS"
\ No newline at end of file diff --git a/webkit/data/layout_tests/chrome/plugins/return-npobject.html b/webkit/data/layout_tests/chrome/plugins/return-npobject.html deleted file mode 100644 index 1851883..0000000 --- a/webkit/data/layout_tests/chrome/plugins/return-npobject.html +++ /dev/null @@ -1,31 +0,0 @@ - -<script> - var test_object = new Object(); - test_object.value = 1; - - function callbk(arg) { - return test_object; - } - - function runtest() { - var obj = plug.testCallbackRet("callbk"); - if (obj == test_object) { - var output = document.getElementById("output"); - output.innerHTML = "SUCCESS"; - } - } -</script> - -<BODY id="bodyId" onload="runtest()"> - -Test that we can get an NPObject returned through a method on -an NPAPI Object.<P> - -Prints "SUCCESS" on success, "FAILURE" on failure. - -<embed name="plug" type="application/x-webkit-test-netscape"> - -<div id=output>FAILURE</div> - -</BODY> - diff --git a/webkit/data/layout_tests/chrome/plugins/script-object-invoke-expected.txt b/webkit/data/layout_tests/chrome/plugins/script-object-invoke-expected.txt deleted file mode 100644 index 2ecbc63..0000000 --- a/webkit/data/layout_tests/chrome/plugins/script-object-invoke-expected.txt +++ /dev/null @@ -1,9 +0,0 @@ -Test proper tracking of script NPObjects - -Test 1: Ensure that script NPObjects are properly tracked (i.e. added to - the live objects map in V8). - -Test 2: Test tracking of derived NPObjects by invoking a method on a - script object and passing it an internally created NPObject. - -SUCCESS diff --git a/webkit/data/layout_tests/chrome/plugins/script-object-invoke.html b/webkit/data/layout_tests/chrome/plugins/script-object-invoke.html deleted file mode 100644 index 50fd263..0000000 --- a/webkit/data/layout_tests/chrome/plugins/script-object-invoke.html +++ /dev/null @@ -1,60 +0,0 @@ -<html> -<script> -// A simple script object with a member function that takes -// an NPObject as an argument -FactoryFunction = function() { - var TestObject = function() { - }; - - TestObject.prototype.createObject = function(plugin) { - var new_object = plugin.testCloneObject(); - return new_object; - }; - - var s = new TestObject(); - return s; -}; - -function new_script_object() { - return FactoryFunction(); -} - -function runTest() -{ - if (window.layoutTestController) - layoutTestController.dumpAsText(); - - var plugin = document.getElementById("testPlugin"); - var returned_object = plugin.testScriptObjectInvoke("new_script_object", "createObject", plugin); - - /* Bug# 1175346 - This will crash in single process mode (or test shell) - TODO(joshia): Enable this and fix the NPObject cleanup so that - it works in single process mode. - plugin.parentNode.removeChild(plugin); - - try { - returned_object.property; - } catch (e) { - if (e instanceof ReferenceError) - document.getElementById("result").innerHTML = "SUCCESS"; - } - */ - - document.getElementById("result").innerHTML = "SUCCESS"; -} -</script> - -<body onload="runTest();"> -<pre> -Test proper tracking of script NPObjects - -Test 1: Ensure that script NPObjects are properly tracked (i.e. added to - the live objects map in V8). - -Test 2: Test tracking of derived NPObjects by invoking a method on a - script object and passing it an internally created NPObject. - -<div id="result">FAILURE</div> -<embed id="testPlugin" type="application/x-webkit-test-netscape" width="200" height="200"></embed> -</body> -</html> diff --git a/webkit/data/layout_tests/chrome/svg/custom/new-image-is-html-element-expected.txt b/webkit/data/layout_tests/chrome/svg/custom/new-image-is-html-element-expected.txt deleted file mode 100644 index 0cdd613..0000000 --- a/webkit/data/layout_tests/chrome/svg/custom/new-image-is-html-element-expected.txt +++ /dev/null @@ -1 +0,0 @@ -PASS
diff --git a/webkit/data/layout_tests/chrome/svg/custom/new-image-is-html-element.svg b/webkit/data/layout_tests/chrome/svg/custom/new-image-is-html-element.svg deleted file mode 100644 index cfa0890..0000000 --- a/webkit/data/layout_tests/chrome/svg/custom/new-image-is-html-element.svg +++ /dev/null @@ -1,14 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg"> - <text id="result" y="100"/> - <script> - if (window.layoutTestController) - layoutTestController.dumpAsText(); - - // Firefox, Opera, and Safari all treat "new Image()" as creating an - // HTML image element regardless of the current doctype. Ensure that - // Chrome's behavior is the same - - var pass = "[object HTMLImageElement]" == new Image(); - document.getElementById("result").appendChild(document.createTextNode(pass ? "PASS" : "FAIL")); - </script> -</svg> diff --git a/webkit/data/layout_tests/platform/chromium-linux/chrome/fast/text/fake-italic-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/chrome/fast/text/fake-italic-expected.checksum deleted file mode 100644 index 4571d07..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/chrome/fast/text/fake-italic-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -700862b25a4995226a2dadaa663e6969
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/chrome/fast/text/fake-italic-expected.png b/webkit/data/layout_tests/platform/chromium-linux/chrome/fast/text/fake-italic-expected.png Binary files differdeleted file mode 100644 index 9893497..0000000 --- a/webkit/data/layout_tests/platform/chromium-linux/chrome/fast/text/fake-italic-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.checksum deleted file mode 100644 index a1d10e8..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -01afa2ed766a30ad8b29cdeb1f42b1b9
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.png b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.png Binary files differdeleted file mode 100644 index 7603565..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.txt deleted file mode 100644 index 08c20a4..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/chrome/fast/text/fake-italic-expected.txt +++ /dev/null @@ -1,13 +0,0 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x54 - RenderText {#text} at (0,0) size 763x54 - text run at (0,0) width 743: "This layout test is designed to test that our fake italic mode is working correctly. The Ahem font, used below, does not" - text run at (0,18) width 763: "include an italic variant. Thus, when we ask for italic Ahem, we should skew the glyphs ourselves, resulting in a series of" - text run at (0,36) width 156: "italic black boxes below." - RenderBlock {P} at (0,70) size 784x16 - RenderText {#text} at (0,0) size 112x16 - text run at (0,0) width 112: "A A A A" diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.checksum deleted file mode 100644 index 5199af3..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.checksum +++ /dev/null @@ -1 +0,0 @@ -1549b8b1a7b47ff85b199dc092e12b54
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.png b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.png Binary files differdeleted file mode 100644 index 6aa3cd8..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.png +++ /dev/null diff --git a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.txt b/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.txt deleted file mode 100644 index acc1d71..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/chrome/fast/text/fake-italic-expected.txt +++ /dev/null @@ -1,13 +0,0 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (8,8) size 784x576 - RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 772x59 - text run at (0,0) width 772: "This layout test is designed to test that our fake italic mode is working correctly. The Ahem font, used below, does not include an" - text run at (0,20) width 760: "italic variant. Thus, when we ask for italic Ahem, we should skew the glyphs ourselves, resulting in a series of italic black boxes" - text run at (0,40) width 41: "below." - RenderBlock {P} at (0,76) size 784x16 - RenderText {#text} at (0,0) size 112x16 - text run at (0,0) width 112: "A A A A" diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 0b1c6f3..bcbbc33 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1306,8 +1306,6 @@ BUG10351 MAC : LayoutTests/plugins/mouse-events.html = FAIL BUG10351 MAC DEBUG : LayoutTests/http/tests/plugins/npapi-response-headers.html = PASS FAIL // Skip because we throw an exception before we get to dumpAsText. BUG10667 SKIP MAC : chrome/plugins/get-url-with-blank-target.html = FAIL -BUG10667 SLOW MAC DEBUG : chrome/plugins/multiple-plugins.html = FAIL PASS -BUG10667 MAC : chrome/plugins/return-npobject.html = FAIL BUG10667 MAC : LayoutTests/plugins/iframe-shims.html = FAIL // BUG10667 SLOW MAC RELEASE : LayoutTests/plugins/iframe-shims.html = FAIL @@ -1333,7 +1331,6 @@ BUG10353 WIN LINUX : LayoutTests/fast/forms/textarea-rows-cols.html = FAIL // Form control scrollbars seem to be drawn incorrectly. BUG10353 LINUX : LayoutTests/fast/replaced/width100percent-textarea.html = FAIL -BUG10668 : chrome/fast/dom/xss-DENIED-javascript-variations.html = FAIL // This test sometimes fails indefinitely, other times it takes 1-2 seconds. BUG14009 LINUX : LayoutTests/http/tests/misc/dns-prefetch-control.html = TIMEOUT PASS FAIL @@ -3142,4 +3139,4 @@ BUG30938 WIN LINUX : LayoutTests/svg/custom/visibility-override-mask.svg = IMAGE BUG30938 WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE BUG30939 WIN LINUX : LayoutTests/svg/custom/image-with-transform-clip-filter.svg = IMAGE BUG30939 : LayoutTests/svg/filters/filter-clip.svg = IMAGE+TEXT -BUG30792 WIN LINUX : LayoutTests/fast/text/fake-italic.html = IMAGE+TEXT
\ No newline at end of file +BUG30792 WIN LINUX : LayoutTests/fast/text/fake-italic.html = IMAGE+TEXT |