Bug 604885 commit backout merge. a=backout
authorChris Pearce <chris@pearce.org.nz>
Tue, 21 Dec 2010 07:46:59 +1300
changeset 59524 a6a3200c19e53743b29edb95a628b061f2f3985a
parent 59522 a92cfed15419bb75893f1adcbb2808c2858cafc8 (current diff)
parent 59523 fd28a949d4ce2a8663706dea4d971152ece8125a (diff)
child 59525 608fc8fa26dc6fe38f7d91a4fdade24522ac7339
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersbackout
bugs604885
milestone2.0b9pre
Bug 604885 commit backout merge. a=backout
layout/reftests/ogg-video/undersize-clipped-ref.html
layout/reftests/ogg-video/undersize-clipped.html
--- a/layout/reftests/ogg-video/reftest.list
+++ b/layout/reftests/ogg-video/reftest.list
@@ -26,9 +26,8 @@ skip-if(gtk2Widget) HTTP(..) == zoomed-1
 == poster-7.html poster-ref-red160x120.html
 == poster-8.html poster-ref-black140x100.html
 == poster-10.html poster-ref-blue250x200.html
 == poster-11.html poster-ref-blue250x200.html
 == poster-12.html poster-ref-blue250x200.html
 == poster-13.html poster-ref-blue400x300.html
 == poster-14.html poster-ref-blue250x200.html
 == poster-15.html poster-ref-green70x30.html
-== undersize-clipped.html undersize-clipped-ref.html
deleted file mode 100644
--- a/layout/reftests/ogg-video/undersize-clipped-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<style>
-#mask {
-  position: absolute;
-  z-index: 3;
-  width: 7px;
-  height: 5px;
-  background-color: green;
-  top: 10px;
-  left: 10px;
-}
-</style>
-</head>
-<body style="background:white;">
-<div id="mask"></div>
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/ogg-video/undersize-clipped.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<style>
-#mask {
-  position: absolute;
-  z-index: 3;
-  width: 7px;
-  height: 5px;
-  background-color: green;
-  top: 10px;
-  left: 10px;
-}
-</style>
-</head>
-<body style="background:white;">
-<!--
-Test if video displays correctly when it's smaller than the amount of space
-required to draw its controls. The controls should be clipped to the css
-specified dimensions.
-
-We draw a mask over the video to prevent the status overlay interferring. The controls
-need to be on (so that the test would fail if they drew outside of the element's
-area) but we need to mask them out as we can't guarantee the status overlay
-will or won't be showing or fading in or out when the reftest does its comparison.
--->
-<div id="mask"></div>
-<video controls src="black140x100.ogv"
-       style="position:absolute; left: 10px; top: 10px; width: 7px; height:5px;">
-</video>
-
-</body>
-</html>