LayoutTests/fast/replaced/object-with-embed-url-param.html - Issue 3551010: Merge 66992 - 2010-09-08 Andy Estes <aestes@apple.com>...

Unified Diff: LayoutTests/fast/replaced/object-with-embed-url-param.html

Issue 3551010: Merge 66992 - 2010-09-08 Andy Estes <aestes@apple.com>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/

Patch Set: Created 10 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/fast/replaced/object-param-url-control-char.html ('k') | LayoutTests/fast/replaced/object-with-embed-url-param-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/fast/replaced/object-with-embed-url-param.html

===================================================================

--- LayoutTests/fast/replaced/object-with-embed-url-param.html (revision 68934)

+++ LayoutTests/fast/replaced/object-with-embed-url-param.html (working copy)

@@ -9,9 +9,11 @@

var object1Result = "";

var object2Result = "";

var embed3Result = "";

+ var embed4Result = "";

+ var object5Result = "";

+ var notified = false;

document.addEventListener("beforeload", function(event) {

if (event.url == "")

return;

@@ -21,12 +23,19 @@

object2Result = (event.url == "object-param" ? "does" : "does not");

} else if (event.target.id == "embed3") {

embed3Result = (event.url == "embed-attr" ? "does" : "does not");

+ } else if (event.target.id == "embed4") {

+ embed4Result = (event.url == "embed-attr" ? "does" : "does not");

+ } else if (event.target.id == "object5") {

+ object5Result = (event.url == "object-param" ? "does" : "does not");

}

- if (object1Result != "" && object2Result != "" && embed3Result != "") {

+ if (!notified && object1Result != "" && object2Result != "" && embed3Result != "" && embed4Result != "" && object5Result != "") {

debug("An <object> with a 'data' @attr and a 'src' <param> should load the URL from the 'data' @attr and " + object1Result + ".");

debug("An <object> with a 'src' <param> should load the URL from the 'src' <param> and " + object2Result + ".");

debug("An <object> with no URL specified and a nested <embed> should load the URL from the 'src' @attr of the <embed> and " + embed3Result + ".");

+ debug("An <object> with a URL specified in a 'src' <param> and a nested <embed> should load the URL from the 'src' @attr of the <embed> and " + embed3Result + ".");

+ debug("An <object> with a URL specified in a 'src' <param> and a MIME type specified in a 'type' <param> should load the URL from the 'src' <param> and " + object5Result + ".");

+ notified = true;

if (window.layoutTestController)

layoutTestController.notifyDone();

}

@@ -38,18 +47,26 @@

</script>

</head>

<body>

+ <p>This test verifies that the right URL is loaded when there is an <object> with a 'src' <param> and a fallback <embed>.</p>

+ <div id="console"></div>

- <param id="param1" name="src" value="object-param"></param>

+ <param name="src" value="object-param"></param>

</object>

- <param id="param2" name="movie" value="object-param"></param>

+ <param name="movie" value="object-param"></param>

</object>

</object>

- <p>This test verifies that the right URL is loaded when there is an <object> with a 'src' <param> and a fallback <embed>.</p>

- <div id="console"></div>

+ <object id="object4">

+ <param name="code" value="object-param"></param>

+ <embed id="embed4" type="application/x-webkit-test-netscape" src="embed-attr">

+ </object>

+ <object id="object5">

+ <param name="url" value="object-param"></param>

+ <param name="type" value="application/x-webkit-test-netscape"></param>

+ </object>

</body>

</html>