Changeset 86440 in webkit

Timestamp:

May 13, 2011 9:58:21 AM (13 years ago)

Author:

robert@webkit.org

Message:

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.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/resources/articles.m4a (deleted)
• platform/chromium/test_expectations.txt (modified) (1 diff)
• platform/qt/Skipped (modified) (1 diff)
• plugins/object-embed-plugin-scripting-expected.txt (moved) (moved from trunk/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt) (1 prop)
• plugins/object-embed-plugin-scripting.html (moved) (moved from trunk/LayoutTests/fast/dom/object-embed-plugin-scripting.html) (9 diffs, 1 prop)
• plugins/resources/apple.gif (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1196 +1196 @@
 // 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
 

trunk/LayoutTests/platform/qt/Skipped

@@ -357 +357 @@
 # ---- 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

trunk/LayoutTests/plugins/object-embed-plugin-scripting.html

@@ -15 +15 @@
     }
 
-    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>
@@ -35 +35 @@
 <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"
@@ -54 +54 @@
     <embed 
         id="myE2"
-        src="resources/articles.m4a"
+        type="application/x-webkit-test-netscape"
         autostart="false"
         enablejavascript="true"
@@ -68 +68 @@
     <embed 
         id="myE3"
-        src="resources/articles.m4a"
+        type="application/x-webkit-test-netscape"
         autostart="false"
         enablejavascript="true"
@@ -83 +83 @@
         <embed 
             id="myE4"
-            src="resources/articles.m4a"
+            type="application/x-webkit-test-netscape"
             autostart="false"
             enablejavascript="true"
@@ -93 +93 @@
 <embed 
     id="myE5"
-    src="resources/articles.m4a"
+    type="application/x-webkit-test-netscape"
     autostart="false"
     enablejavascript="true"
@@ -101 +101 @@
 <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">
@@ -110 +110 @@
     <embed
         name="Plugin"
-        src="resources/articles.m4a"
+        type="application/x-webkit-test-netscape"
         autostart="false"
         enablejavascript="true"
@@ -121 +121 @@
     <embed
         name="Plugin2"
-        src="resources/articles.m4a"
+        type="application/x-webkit-test-netscape"
         autostart="false"
         enablejavascript="true"