Bug 726904: Make nsVideoFrame::GetVideoIntrinsicSize return the video size before the poster size. r=cpearce
authorChristopher De Cairos <chris@chrisdecairos.ca>
Fri, 11 May 2012 20:32:15 +1200
changeset 93779 559fdd1b5e07
parent 93778 386fac446673
child 93780 f968eb88b163
push id9313
push usercpearce@mozilla.com
push dateFri, 11 May 2012 08:33:26 +0000
treeherdermozilla-inbound@f968eb88b163 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs726904
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 726904: Make nsVideoFrame::GetVideoIntrinsicSize return the video size before the poster size. r=cpearce
content/html/content/public/nsHTMLVideoElement.h
content/html/content/src/nsHTMLVideoElement.cpp
content/media/test/Makefile.in
content/media/test/manifest.js
content/media/test/test_bug726904.html
layout/generic/nsVideoFrame.cpp
layout/reftests/ogg-video/blue140x100.png
layout/reftests/ogg-video/poster-1.html
layout/reftests/ogg-video/poster-11.html
layout/reftests/ogg-video/poster-12.html
layout/reftests/ogg-video/poster-15.html
layout/reftests/ogg-video/poster-7.html
layout/reftests/ogg-video/poster-ref-blue140x100.html
layout/reftests/ogg-video/poster-ref-red140x100.html
layout/reftests/ogg-video/poster-ref-red160x120.html
layout/reftests/ogg-video/red140x100.png
layout/reftests/ogg-video/reftest.list
layout/reftests/webm-video/blue140x100.png
layout/reftests/webm-video/poster-1.html
layout/reftests/webm-video/poster-11.html
layout/reftests/webm-video/poster-12.html
layout/reftests/webm-video/poster-15.html
layout/reftests/webm-video/poster-7.html
layout/reftests/webm-video/poster-ref-blue140x100.html
layout/reftests/webm-video/poster-ref-red140x100.html
layout/reftests/webm-video/red140x100.png
layout/reftests/webm-video/reftest.list
--- a/content/html/content/public/nsHTMLVideoElement.h
+++ b/content/html/content/public/nsHTMLVideoElement.h
@@ -78,19 +78,19 @@ public:
                                 nsIAtom* aAttribute,
                                 const nsAString& aValue,
                                 nsAttrValue& aResult);
   NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
   virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() const;
 
   virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
 
-  // Returns the current video frame width and height.
-  // If there is no video frame, returns the given default size.
-  nsIntSize GetVideoSize(nsIntSize defaultSize);
+  // Set size with the current video frame's height and width.
+  // If there is no video frame, returns NS_ERROR_FAILURE.
+  nsresult GetVideoSize(nsIntSize* size);
 
   virtual nsresult SetAcceptHeader(nsIHttpChannel* aChannel);
 
   virtual nsXPCClassInfo* GetClassInfo();
 
   virtual nsIDOMNode* AsDOMNode() { return this; }
 };
 
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -107,19 +107,25 @@ nsHTMLVideoElement::nsHTMLVideoElement(a
   : nsHTMLMediaElement(aNodeInfo)
 {
 }
 
 nsHTMLVideoElement::~nsHTMLVideoElement()
 {
 }
 
-nsIntSize nsHTMLVideoElement::GetVideoSize(nsIntSize aDefaultSize)
+nsresult nsHTMLVideoElement::GetVideoSize(nsIntSize* size)
 {
-  return mMediaSize.width == -1 && mMediaSize.height == -1 ? aDefaultSize : mMediaSize;
+  if (mMediaSize.width == -1 && mMediaSize.height == -1) {
+    return NS_ERROR_FAILURE;
+  }
+
+  size->height = mMediaSize.height;
+  size->width = mMediaSize.width;
+  return NS_OK;
 }
 
 bool
 nsHTMLVideoElement::ParseAttribute(PRInt32 aNamespaceID,
                                    nsIAtom* aAttribute,
                                    const nsAString& aValue,
                                    nsAttrValue& aResult)
 {
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -278,16 +278,17 @@ ifdef MOZ_OGG
 		noContentLength.sjs \
 		test_seekable2.html \
 		test_seekable3.html \
 		test_a4_tone.html \
 		file_audio_event_adopt_iframe.html \
 		test_audio_event_adopt.html \
 		test_framebuffer.html \
 		test_referer.html \
+		test_bug726904.html \
 		test_bug686137.html \
 		$(NULL)
 else
 _TEST_FILES += \
 		test_can_play_type_no_ogg.html \
 		$(NULL)
 endif
 
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -3,17 +3,17 @@
 // "bogus/duh" in each list.
 
 // These are small test files, good for just seeing if something loads. We
 // really only need one test file per backend here.
 var gSmallTests = [
   { name:"small-shot.ogg", type:"audio/ogg", duration:0.276 },
   { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
   { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.233 },
-  { name:"seek.webm", type:"video/webm", duration:3.966 },
+  { name:"seek.webm", type:"video/webm", width:320, height:240, duration:3.966 },
   { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
 // Used by test_progress to ensure we get the correct progress information
 // during resource download.
 var gProgressTests = [
   { name:"r11025_u8_c1.wav", type:"audio/x-wav", duration:1.0, size:11069 },
new file mode 100644
--- /dev/null
+++ b/content/media/test/test_bug726904.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=726904
+-->
+
+<head>
+  <title>Media test: default video size</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body onload="bodyLoaded();">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=726904">Mozilla Bug 726904</a>
+
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+var v1 = document.createElement("video"),
+    v2 = document.createElement("video"),
+    poster = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZAAAAGQCAAAAACl1GkQAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAALJJREFUeNrtwQENAAAAwqD3T20ON6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHg0cq4AATRk8BYAAAAASUVORK5CYII",
+    resource = getPlayableVideo(gSmallTests);
+
+function bodyLoaded(){
+  is(v1.videoWidth, resource.width, "Intrinsic width should match video width");
+  is(v1.videoHeight, resource.height, "Intrinsic height should match video height");
+  is(v2.clientWidth, 400, "clientWidth should be 400");
+  is(v2.clientHeight, 400, "clientHeight should be 400");
+  SimpleTest.finish();
+}
+
+if (resource) {
+  v1.poster = v2.poster = poster;
+
+  v1.src = v2.src = "http://mochi.test:8888/tests/content/media/test/" + resource.name;
+
+  v1.preload = "auto";
+  v2.preload = "none";
+
+  v1.muted = v2.muted = true;
+
+  document.body.appendChild(v1);
+  document.body.appendChild(v2);
+} else {
+  todo(false, "No types supported");
+}
+
+</script>
+</pre>
+</body>
+</html>
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -185,19 +185,20 @@ CorrectForAspectRatio(const gfxRect& aRe
 
 already_AddRefed<Layer>
 nsVideoFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
                          LayerManager* aManager,
                          nsDisplayItem* aItem)
 {
   nsRect area = GetContentRect() - GetPosition() + aItem->ToReferenceFrame();
   nsHTMLVideoElement* element = static_cast<nsHTMLVideoElement*>(GetContent());
-  nsIntSize videoSize = element->GetVideoSize(nsIntSize(0, 0));
-  if (videoSize.width <= 0 || videoSize.height <= 0 || area.IsEmpty())
+  nsIntSize videoSize;
+  if (NS_FAILED(element->GetVideoSize(&videoSize)) || area.IsEmpty()) {
     return nsnull;
+  }
 
   nsRefPtr<ImageContainer> container = element->GetImageContainer();
   if (!container)
     return nsnull;
   
   // Retrieve the size of the decoded video frame, before being scaled
   // by pixel aspect ratio.
   gfxIntSize frameSize = container->GetCurrentSize();
@@ -520,45 +521,41 @@ bool nsVideoFrame::ShouldDisplayPoster()
   return true;
 }
 
 nsSize
 nsVideoFrame::GetVideoIntrinsicSize(nsRenderingContext *aRenderingContext)
 {
   // Defaulting size to 300x150 if no size given.
   nsIntSize size(300, 150);
-
-  if (ShouldDisplayPoster()) {
-    // Use the poster image frame's size.
-    nsIFrame *child = mFrames.FirstChild();
-    if (child && child->GetType() == nsGkAtoms::imageFrame) {
-      nsImageFrame* imageFrame = static_cast<nsImageFrame*>(child);
-      nsSize imgsize;
-      if (NS_SUCCEEDED(imageFrame->GetIntrinsicImageSize(imgsize))) {
-        return imgsize;
-      }
-    }
-  }
-
+  
   if (!HasVideoElement()) {
     if (!aRenderingContext || !mFrames.FirstChild()) {
       // We just want our intrinsic ratio, but audio elements need no
       // intrinsic ratio, so just return "no ratio". Also, if there's
       // no controls frame, we prefer to be zero-sized.
       return nsSize(0, 0);
     }
 
     // Ask the controls frame what its preferred height is
     nsBoxLayoutState boxState(PresContext(), aRenderingContext, 0);
     nscoord prefHeight = mFrames.LastChild()->GetPrefSize(boxState).height;
     return nsSize(nsPresContext::CSSPixelsToAppUnits(size.width), prefHeight);
   }
 
   nsHTMLVideoElement* element = static_cast<nsHTMLVideoElement*>(GetContent());
-  size = element->GetVideoSize(size);
+  if (NS_FAILED(element->GetVideoSize(&size)) && ShouldDisplayPoster()) {
+    // Use the poster image frame's size.
+    nsIFrame *child = mPosterImage->GetPrimaryFrame();
+    nsImageFrame* imageFrame = do_QueryFrame(child);
+    nsSize imgsize;
+    if (NS_SUCCEEDED(imageFrame->GetIntrinsicImageSize(imgsize))) {
+      return imgsize;
+    }
+  }
 
   return nsSize(nsPresContext::CSSPixelsToAppUnits(size.width),
                 nsPresContext::CSSPixelsToAppUnits(size.height));
 }
 
 nsresult
 nsVideoFrame::UpdatePosterSource(bool aNotify)
 {
@@ -594,11 +591,12 @@ bool nsVideoFrame::HasVideoElement() {
   return videoDomElement != nsnull;
 }
 
 bool nsVideoFrame::HasVideoData()
 {
   if (!HasVideoElement())
     return false;
   nsHTMLVideoElement* element = static_cast<nsHTMLVideoElement*>(GetContent());
-  nsIntSize size = element->GetVideoSize(nsIntSize(0,0));
+  nsIntSize size(0, 0);
+  element->GetVideoSize(&size);
   return size != nsIntSize(0,0);
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f4c3973fcc7b7b7f742c5da983e30c0222c3a663
GIT binary patch
literal 277
zc%17D@N?(olHy`uVBq!ia0vp^JwTko!2~34Z}o2jQjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_B+h%OiBhHH%zMs3N80^aSW-r_4cA8BLf4=0f#Tbu2rm8
zKJ0M4k$S$ZE?mq(NX4T`#bW}C=L7{#Ar(g)T+T_jxImRSxJ@{@j%eIV%lSG)m`We#
S>mLF-nZeW5&t;ucLK6TEF-brG
--- a/layout/reftests/ogg-video/poster-1.html
+++ b/layout/reftests/ogg-video/poster-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body style="background:white;">
-<!-- Test if poster frame displays correctly when poster is different size. -->
-<video src="black140x100.ogv" poster="blue250x200.png"></video>
+<!-- Ensure video element displays at poster size when video's intrinsic size isn't available. -->
+<video preload="none" src="black140x100.ogv" poster="blue250x200.png"></video>
 </body>
 </html>
--- a/layout/reftests/ogg-video/poster-11.html
+++ b/layout/reftests/ogg-video/poster-11.html
@@ -6,17 +6,17 @@ function runTest() {
   var v = document.createElement('video');
   
   var endTest = function() {
     setTimeout(function(){document.documentElement.className = '';}, 0);
   };  
   
   var addPoster = function() {
     v.removeEventListener('loadeddata', addPoster, false);
-    v.poster = "blue250x200.png";
+    v.poster = "blue140x100.png";
     v.addEventListener('loadeddata', endTest, false);
     v.load();
   };
   
   v.addEventListener('loadeddata', addPoster, false);
   v.id = 'v';
   v.src = "black140x100.ogv";
   v.preload = "auto";
--- a/layout/reftests/ogg-video/poster-12.html
+++ b/layout/reftests/ogg-video/poster-12.html
@@ -12,17 +12,17 @@ function runTest() {
   var play = 
     function() {
       v.removeEventListener('loadeddata', play, false);
       v.play();
     }
 
   var addPoster = function() {
     v.removeEventListener('playing', addPoster,false);
-    v.poster = "blue250x200.png";
+    v.poster = "blue140x100.png";
     v.addEventListener('loadeddata', endTest, false);
     v.load();
   };
 
   v.addEventListener('loadeddata',
                      play,
                      false);
   v.addEventListener('playing',
--- a/layout/reftests/ogg-video/poster-15.html
+++ b/layout/reftests/ogg-video/poster-15.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <!-- Test that poster is correctly laid out inside borders. Also test that 
      poster frames smaller than video don't have the video frame drawn behind
      them etc. -->
 <body style="background:white;">
 <video src="black140x100.ogv"
        poster="green70x30.png"
-       preload="auto"
+       preload="none"
        style="border: solid blue 2px;">
 </video>
 </body>
 </html>
--- a/layout/reftests/ogg-video/poster-7.html
+++ b/layout/reftests/ogg-video/poster-7.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
 <body style="background:white;">
 <!-- Test that poster frame changes when you change the poster attribute. -->
 <video src="black140x100.ogv"
-       preload="auto"
+       preload="none"
        id="v"
-       onload="document.getElementById('v').poster = 'red160x120.png'; setTimeout(function(){document.documentElement.className = '';}, 0);"
+       onload="document.getElementById('v').poster = 'red140x100.png'; setTimeout(function(){document.documentElement.className = '';}, 0);"
        poster="blue250x200.png"></video>
 </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-blue140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="blue140x100.png" alt="poster">
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/ogg-video/poster-ref-red140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="red140x100.png" alt="poster">
+</body>
+</html>
deleted file mode 100644
--- a/layout/reftests/ogg-video/poster-ref-red160x120.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body style="background:white;">
-<img src="red160x120.png" alt="poster">
-</body>
-</html>
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..20250771f3d391e5fd65a0076d9c0e60e404ad4f
GIT binary patch
literal 274
zc%17D@N?(olHy`uVBq!ia0vp^JwTko!2~34Z}o2jQjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_B+h%j7I8K&-ZTt3N7(;aSW-r_4cA6BLf4+VS@wvpC=}}
zYc0IlbIY1rfm2AuQAow3NyTFV3+E(UTozAU+$Nk{N1R**H15ik?0eTT9@lx8A^>zR
NgQu&X%Q~loCIEFbNF4wG
--- a/layout/reftests/ogg-video/reftest.list
+++ b/layout/reftests/ogg-video/reftest.list
@@ -19,15 +19,15 @@ random skip-if(Android) HTTP(..) == obje
 random skip-if(Android) HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
 skip-if(Android) skip-if(gtk2Widget) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html
 skip-if(Android) == poster-1.html poster-ref-blue250x200.html
 skip-if(Android) == poster-2.html poster-ref-black140x100.html
 skip-if(Android) == poster-3.html poster-ref-black140x100.html
 skip-if(Android) == poster-4.html poster-ref-black140x100.html
 skip-if(Android) == poster-5.html poster-ref-black140x100.html
 skip-if(Android) == poster-6.html poster-ref-black140x100.html
-skip-if(Android) == poster-7.html poster-ref-red160x120.html
+skip-if(Android) == poster-7.html poster-ref-red140x100.html
 skip-if(Android) == poster-8.html poster-ref-black140x100.html
-skip-if(Android) == poster-10.html poster-ref-blue250x200.html
-skip-if(Android) == poster-11.html poster-ref-blue250x200.html
-skip-if(Android) == poster-12.html poster-ref-blue250x200.html
+skip-if(Android) == poster-10.html poster-ref-blue140x100.html
+skip-if(Android) == poster-11.html poster-ref-blue140x100.html
+skip-if(Android) == poster-12.html poster-ref-blue140x100.html
 skip-if(Android) == poster-13.html poster-ref-blue400x300.html
 skip-if(Android) == poster-15.html poster-ref-green70x30.html
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f4c3973fcc7b7b7f742c5da983e30c0222c3a663
GIT binary patch
literal 277
zc%17D@N?(olHy`uVBq!ia0vp^JwTko!2~34Z}o2jQjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_B+h%OiBhHH%zMs3N80^aSW-r_4cA8BLf4=0f#Tbu2rm8
zKJ0M4k$S$ZE?mq(NX4T`#bW}C=L7{#Ar(g)T+T_jxImRSxJ@{@j%eIV%lSG)m`We#
S>mLF-nZeW5&t;ucLK6TEF-brG
--- a/layout/reftests/webm-video/poster-1.html
+++ b/layout/reftests/webm-video/poster-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body style="background:white;">
-<!-- Test if poster frame displays correctly when poster is different size. -->
-<video src="black140x100.webm" poster="blue250x200.png"></video>
+<!-- Ensure video element displays at poster size when video's intrinsic size isn't available -->
+<video preload="none" src="black140x100.webm" poster="blue250x200.png"></video>
 </body>
 </html>
--- a/layout/reftests/webm-video/poster-11.html
+++ b/layout/reftests/webm-video/poster-11.html
@@ -6,17 +6,17 @@ function runTest() {
   var v = document.createElement('video');
   
   var endTest = function() {
     setTimeout(function(){document.documentElement.className = '';}, 0);
   };  
   
   var addPoster = function() {
     v.removeEventListener('loadeddata', addPoster, false);
-    v.poster = "blue250x200.png";
+    v.poster = "blue140x100.png";
     v.addEventListener('loadeddata', endTest, false);
     v.load();
   };
   
   v.addEventListener('loadeddata', addPoster, false);
   v.id = 'v';
   v.src = "black140x100.webm";
   v.preload = "auto";
--- a/layout/reftests/webm-video/poster-12.html
+++ b/layout/reftests/webm-video/poster-12.html
@@ -12,17 +12,17 @@ function runTest() {
   var play = 
     function() {
       v.removeEventListener('loadeddata', play, false);
       v.play();
     }
 
   var addPoster = function() {
     v.removeEventListener('playing', addPoster,false);
-    v.poster = "blue250x200.png";
+    v.poster = "blue140x100.png";
     v.addEventListener('loadeddata', endTest, false);
     v.load();
   };
 
   v.addEventListener('loadeddata',
                      play,
                      false);
   v.addEventListener('playing',
--- a/layout/reftests/webm-video/poster-15.html
+++ b/layout/reftests/webm-video/poster-15.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html>
 <!-- Test that poster is correctly laid out inside borders. Also test that 
      poster frames smaller than video don't have the video frame drawn behind
      them etc. -->
 <body style="background:white;">
 <video src="black140x100.webm"
        poster="green70x30.png"
-       preload="auto"
+       preload="none"
        style="border: solid blue 2px;">
 </video>
 </body>
 </html>
--- a/layout/reftests/webm-video/poster-7.html
+++ b/layout/reftests/webm-video/poster-7.html
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
 <body style="background:white;">
 <!-- Test that poster frame changes when you change the poster attribute. -->
 <video src="black140x100.webm"
-       preload="auto"
+       preload="none"
        id="v"
-       onload="document.getElementById('v').poster = 'red160x120.png'; setTimeout(function(){document.documentElement.className = '';}, 0);"
+       onload="document.getElementById('v').poster = 'red140x100.png'; setTimeout(function(){document.documentElement.className = '';}, 0);"
        poster="blue250x200.png"></video>
 </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/webm-video/poster-ref-blue140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="blue140x100.png" alt="poster">
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/webm-video/poster-ref-red140x100.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="background:white;">
+<img src="red140x100.png" alt="poster">
+</body>
+</html>
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..20250771f3d391e5fd65a0076d9c0e60e404ad4f
GIT binary patch
literal 274
zc%17D@N?(olHy`uVBq!ia0vp^JwTko!2~34Z}o2jQjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_B+h%j7I8K&-ZTt3N7(;aSW-r_4cA6BLf4+VS@wvpC=}}
zYc0IlbIY1rfm2AuQAow3NyTFV3+E(UTozAU+$Nk{N1R**H15ik?0eTT9@lx8A^>zR
NgQu&X%Q~loCIEFbNF4wG
--- a/layout/reftests/webm-video/reftest.list
+++ b/layout/reftests/webm-video/reftest.list
@@ -19,16 +19,16 @@ random skip-if(Android) HTTP(..) == obje
 random skip-if(Android) HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
 skip-if(Android) skip-if(gtk2Widget) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html
 skip-if(Android) == poster-1.html poster-ref-blue250x200.html
 skip-if(Android) == poster-2.html poster-ref-black140x100.html
 skip-if(Android) == poster-3.html poster-ref-black140x100.html
 skip-if(Android) == poster-4.html poster-ref-black140x100.html
 skip-if(Android) == poster-5.html poster-ref-black140x100.html
 skip-if(Android) == poster-6.html poster-ref-black140x100.html
-skip-if(Android) == poster-7.html poster-ref-red160x120.html
+skip-if(Android) == poster-7.html poster-ref-red140x100.html
 skip-if(Android) == poster-8.html poster-ref-black140x100.html
-skip-if(Android) == poster-10.html poster-ref-blue250x200.html
-skip-if(Android) == poster-11.html poster-ref-blue250x200.html
-skip-if(Android) == poster-12.html poster-ref-blue250x200.html
+skip-if(Android) == poster-10.html poster-ref-blue140x100.html
+skip-if(Android) == poster-11.html poster-ref-blue140x100.html
+skip-if(Android) == poster-12.html poster-ref-blue140x100.html
 skip-if(Android) == poster-13.html poster-ref-blue400x300.html
 skip-if(Android) == poster-15.html poster-ref-green70x30.html
 == bug686957.html bug686957-ref.html