Diff
Modified: trunk/LayoutTests/ChangeLog (173628 => 173629)
--- trunk/LayoutTests/ChangeLog 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/ChangeLog 2014-09-15 20:17:18 UTC (rev 173629)
@@ -1,3 +1,20 @@
+2014-09-15 Roger Fong <[email protected]>
+
+ Change all snapshotting tests to use quicktime.
+
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt:
+ * plugins/snapshotting/autoplay-dominant-blank-plugin-moved-into-view.html:
+ * plugins/snapshotting/autoplay-dominant.html:
+ * plugins/snapshotting/autoplay-plugin-blocked-by-image.html:
+ * plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html:
+ * plugins/snapshotting/autoplay-similar-to-dominant.html:
+ * plugins/snapshotting/plugin-receives-click-event.html:
+ * plugins/snapshotting/restart.html:
+ * plugins/snapshotting/set-plugin-size-to-tiny.html:
+ * plugins/snapshotting/simple.html:
+ * plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html:
+
2014-08-07 Sergio Villar Senin <[email protected]>
[CSS Grid Layout] Sort items by span when resolving content-based track sizing functions
@@ -527,6 +544,23 @@
2014-09-12 Roger Fong <[email protected]>
+ Switch all snapshotting tests to use quicktime instead of flash.
+
+ * platform/mac-wk2/TestExpectations:
+ * plugins/snapshotting/autoplay-dominant-blank-plugin-moved-into-view.html:
+ * plugins/snapshotting/autoplay-dominant.html:
+ * plugins/snapshotting/autoplay-plugin-blocked-by-image.html:
+ * plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html:
+ * plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html:
+ * plugins/snapshotting/autoplay-similar-to-dominant.html:
+ * plugins/snapshotting/plugin-receives-click-event.html:
+ * plugins/snapshotting/restart.html:
+ * plugins/snapshotting/set-plugin-size-to-tiny.html:
+ * plugins/snapshotting/simple.html:
+ * plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html:
+
+2014-09-12 Roger Fong <[email protected]>
+
Unreviewed. WebGL conformance test gardening.
* platform/mac/TestExpectations:
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (173628 => 173629)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-09-15 20:17:18 UTC (rev 173629)
@@ -636,9 +636,8 @@
[ Mavericks ] http/tests/navigation/ping-cookie.html [ Skip ]
# https://bugs.webkit.org/show_bug.cgi?id=133227
-plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
+plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html
plugins/snapshotting/set-plugin-size-to-tiny.html
-plugins/snapshotting/simple.html
### END OF (6) Features that are not supported in WebKit2, on Mavericks
########################################
Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt (173628 => 173629)
--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt 2014-09-15 20:17:18 UTC (rev 173629)
@@ -4,7 +4,3 @@
-
-
-
-
Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-dominant-blank-plugin-moved-into-view.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/autoplay-dominant-blank-plugin-moved-into-view.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-dominant-blank-plugin-moved-into-view.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -17,4 +17,4 @@
}, 500 );
}
</script>
-<embed id="plugin" src="" width="600" height="600" style="position:relative; left:-600px;"></embed>
+<embed id="plugin" src="" width="600" height="600" style="position:relative; left:-600px;"></embed>
Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -15,4 +15,4 @@
}, 1000);
}
</script>
-<embed id="plugin" src="" width="600" height="600"></embed>
+<embed id="plugin" src="" width="600" height="600"></embed>
Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -15,5 +15,5 @@
}, 1000);
}
</script>
-<embed id="plugin" src="" width="600" height="600"></embed>
+<embed id="plugin" src="" width="600" height="600"></embed>
<img src="" width="600" height="600" style="position:absolute; top:60px; left:0px;">
Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -15,5 +15,5 @@
}, 1000);
}
</script>
-<embed id="plugin" src="" width="600" height="600"></embed>
+<embed id="plugin" src="" width="600" height="600"></embed>
<img src="" width="600" height="600" style="position:absolute; top:45px; left:0px;">
Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -10,26 +10,16 @@
var result = document.getElementById("result");
var embed1 = document.getElementById("plugin1");
var embed2 = document.getElementById("plugin2");
- var embed3 = document.getElementById("plugin3");
- var embed4 = document.getElementById("plugin4");
- if (!(internals.isPluginSnapshotted(embed1)
- || internals.isPluginSnapshotted(embed2)
- || internals.isPluginSnapshotted(embed3)
- || internals.isPluginSnapshotted(embed4)))
- result.innerHTML = "PASS";
+ if (!internals.isPluginSnapshotted(embed1)
+ && !internals.isPluginSnapshotted(embed2))
+ result.innerHTML = "PASS";
testRunner.notifyDone();
- }, 2000);
+ }, 1000);
}
</script>
<p>
-<embed id="plugin1" src="" width="600" height="600"></embed>
+<embed id="plugin1" src="" width="400" height="400"></embed>
</p>
<p>
-<embed id="plugin2" src="" width="200" height="200"></embed>
+<embed id="plugin2" src="" width="50" height="50"></embed>
</p>
-<p>
-<embed id="plugin3" src="" width="100" height="100"></embed>
-</p>
-<p>
-<embed id="plugin4" src="" width="50" height="50"></embed>
-</p>
Modified: trunk/LayoutTests/plugins/snapshotting/plugin-receives-click-event.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/plugin-receives-click-event.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/plugin-receives-click-event.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -1,4 +1,4 @@
-<embed id="plugin" src=""
+<embed id="plugin" src=""
<div id="result">FAIL, plugin did not receive mouse click event.</div>
<script>
if (window.testRunner) {
Modified: trunk/LayoutTests/plugins/snapshotting/restart.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/restart.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/restart.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -22,4 +22,4 @@
}, 1000);
}
</script>
-<embed id="plugin" src=""
+<embed id="plugin" src=""
Modified: trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -18,8 +18,8 @@
if (!internals.isPluginSnapshotted(embed1) && internals.isPluginSnapshotted(embed2))
result.innerHTML = "PASS";
testRunner.notifyDone();
- }, 2000);
+ }, 1000);
}
</script>
-<embed id="plugin1" src=""
-<embed id="plugin2" src="" style="width:300px; height:300px"></embed>
+<embed id="plugin1" src=""
+<embed id="plugin2" src="" style="width:50px; height:50px"></embed>
Modified: trunk/LayoutTests/plugins/snapshotting/simple.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/simple.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/simple.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -15,4 +15,4 @@
}, 1000);
}
</script>
-<embed id="plugin" src=""
+<embed id="plugin" src=""
Modified: trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html (173628 => 173629)
--- trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html 2014-09-15 20:05:49 UTC (rev 173628)
+++ trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html 2014-09-15 20:17:18 UTC (rev 173629)
@@ -17,8 +17,8 @@
}, 1500);
}
</script>
-<embed id="plugin1" src="" width="600" height="600"></embed>
+<embed id="plugin1" src="" width="600" height="600"></embed>
<img src="" width="600" height="600" style="position:absolute; top:25px; left:0px">
<br>
-<embed id="plugin2" src="" width="600" height="600"></embed>
+<embed id="plugin2" src="" width="600" height="600"></embed>
<img src="" width="300" height="300" style="-webkit-transform:translate(200px,-500px)">
