Commit 7e68d0bd authored by robert@webkit.org's avatar robert@webkit.org

2011-05-02 Robert Hogan <robert@webkit.org>

        Reviewed by Eric Seidel.

        Make fast/dom/object-embed-plugin-scripting.html compatible with non-Mac ports

        https://bugs.webkit.org/show_bug.cgi?id=59930

        * fast/dom/resources/articles.m4a: Removed.
        * platform/chromium/test_expectations.txt: Unskip object-embed-plugin-scripting.html on Linux
        * platform/qt/Skipped: Unskip object-embed-plugin-scripting.html
        * plugins/object-embed-plugin-scripting-expected.txt: Renamed from LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt.
        * plugins/object-embed-plugin-scripting.html: Renamed from LayoutTests/fast/dom/object-embed-plugin-scripting.html.
        * plugins/resources/apple.gif: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86440 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5bffb145
2011-05-02 Robert Hogan <robert@webkit.org>
Reviewed by Eric Seidel.
Make fast/dom/object-embed-plugin-scripting.html compatible with non-Mac ports
https://bugs.webkit.org/show_bug.cgi?id=59930
* fast/dom/resources/articles.m4a: Removed.
* platform/chromium/test_expectations.txt: Unskip object-embed-plugin-scripting.html on Linux
* platform/qt/Skipped: Unskip object-embed-plugin-scripting.html
* plugins/object-embed-plugin-scripting-expected.txt: Renamed from LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt.
* plugins/object-embed-plugin-scripting.html: Renamed from LayoutTests/fast/dom/object-embed-plugin-scripting.html.
* plugins/resources/apple.gif: Added.
2011-05-13 Steve VanDeBogart <vandebo@chromium.org>
Unreviewed.
......@@ -1195,7 +1195,6 @@ BUGCR10350 LINUX : fast/replaced/width100percent-radio.html = FAIL
// These tests are marked as failing on Linux because they depend on QuickTime.
// See the bug for more discussion.
BUGCR15797 LINUX : fast/dom/object-embed-plugin-scripting.html = FAIL
BUGCR15797 LINUX : plugins/embed-attributes-setting.html = FAIL CRASH
// Skip because we throw an exception before we get to dumpAsText.
......
......@@ -356,7 +356,6 @@ plugins/get-url-with-blank-target.html
plugins/embed-attributes-style.html
# ---- depends on QuickTime support
plugins/embed-attributes-setting.html
fast/dom/object-embed-plugin-scripting.html
plugins/plugin-initiate-popup-window.html
# ---- to be reviewed
http/tests/plugins/plugin-document-has-focus.html
......
......@@ -14,15 +14,15 @@ function test()
layoutTestController.dumpAsText();
}
print("plugin <object> with nested plugin <embed>: should have a plugin and does " + (document.getElementById('myO').Play ? "" : "not"));
print("plugin <embed> netsted in plugin <object>: should have a plugin and does " + (document.getElementById('myE').Play ? "" : "not"));
print("empty <object> with nested plugin <embed>: should not have a plugin and does " + (document.getElementById('myO2').Play ? "" : "not"));
print("plugin <embed> nested in empty <object>: should have a plugin and does " + (document.getElementById('myE2').Play ? "" : "not"));
print("plugin <embed> nested in image <object>: should not have a plugin and does " + (document.getElementById('myE3').Play ? "" : "not"));
print("plugin <embed> nested in empty <object> nested in plugin <object>: should not have a plugin and does " + (document.getElementById('myE4').Play ? "" : "not"));
print("standalone plugin <embed>: should have a plugin and does " + (document.getElementById('myE5').Play ? "" : "not"));
print("plugin <object> with nested plugin <embed> of the same name should have a plugin and does " + (document.Plugin.Play ? "" : "not"));
print("empty <object> with nested plugin <embed> of the same name should have a plugin and does " + (document.Plugin2.Play ? "" : "not"));
print("plugin <object> with nested plugin <embed>: should have a plugin and does " + (document.getElementById('myO').testCallback ? "" : "not"));
print("plugin <embed> netsted in plugin <object>: should have a plugin and does " + (document.getElementById('myE').testCallback ? "" : "not"));
print("empty <object> with nested plugin <embed>: should not have a plugin and does " + (document.getElementById('myO2').testCallback ? "" : "not"));
print("plugin <embed> nested in empty <object>: should have a plugin and does " + (document.getElementById('myE2').testCallback ? "" : "not"));
print("plugin <embed> nested in image <object>: should not have a plugin and does " + (document.getElementById('myE3').testCallback ? "" : "not"));
print("plugin <embed> nested in empty <object> nested in plugin <object>: should not have a plugin and does " + (document.getElementById('myE4').testCallback ? "" : "not"));
print("standalone plugin <embed>: should have a plugin and does " + (document.getElementById('myE5').testCallback ? "" : "not"));
print("plugin <object> with nested plugin <embed> of the same name should have a plugin and does " + (document.Plugin.testCallback ? "" : "not"));
print("empty <object> with nested plugin <embed> of the same name should have a plugin and does " + (document.Plugin2.testCallback ? "" : "not"));
}
</script>
</head>
......@@ -34,15 +34,15 @@ function test()
<OBJECT
id="myO"
type="audio/mp4"
type="application/x-webkit-test-netscape"
width = 0 height = 0
>
<PARAM name="src" value="resources/articles.m4a">
<PARAM name="src" value="resources/simple_blank.swf">
<PARAM name="autostart" value="false">
<EMBED
id="myE"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......@@ -53,7 +53,7 @@ function test()
<object id="myO2">
<embed
id="myE2"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......@@ -67,7 +67,7 @@ function test()
>
<embed
id="myE3"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......@@ -82,7 +82,7 @@ function test()
<object>
<embed
id="myE4"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......@@ -92,7 +92,7 @@ function test()
<embed
id="myE5"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......@@ -100,16 +100,16 @@ function test()
<object
name="Plugin"
type="audio/mp4"
type="application/x-webkit-test-netscape"
width = 0 height = 0
>
<param name="src" value="resources/articles.m4a">
<param name="src" value="resources/simple_blank.swf">
<param name="autostart" value="false">
<param name="enablejavascript" value="true">
<embed
name="Plugin"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......@@ -120,7 +120,7 @@ function test()
<object name="Plugin2">
<embed
name="Plugin2"
src="resources/articles.m4a"
type="application/x-webkit-test-netscape"
autostart="false"
enablejavascript="true"
width = 0 height = 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment