corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 560059 - Correct video dimensions on failed load. r=roc

Browse Source
This commit is contained in:
Ms2ger
2010-06-16 09:53:44 +12:00
parent d7ed1b66cb
commit 320c8fe05a
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
content/html/content/reftests/560059-video-dimensions-ref.html Normal file
View File

@@ -0,0 +1,3 @@
<!doctype html>
<title>Video dimensions</title>
<video style="border: thin solid black;" width="300" height="150"></video>

3
content/html/content/reftests/560059-video-dimensions.html Normal file
View File

@@ -0,0 +1,3 @@
<!doctype html>
<title>Video dimensions</title>
<video style="border: thin solid black;"></video>

1
content/html/content/reftests/reftest.list
View File

@@ -9,4 +9,5 @@
== 468263-2.html 468263-2-alternate-ref.html == 468263-2.html 468263-2-alternate-ref.html
== 484200-1.html 484200-1-ref.html == 484200-1.html 484200-1-ref.html
== 557840.html 557840-ref.html == 557840.html 557840-ref.html
== 560059-video-dimensions.html 560059-video-dimensions-ref.html
== href-attr-change-restyles.html href-attr-change-restyles-ref.html == href-attr-change-restyles.html href-attr-change-restyles-ref.html

4
layout/generic/nsVideoFrame.cpp
View File

@@ -515,7 +515,7 @@ nsSize
nsVideoFrame::GetVideoIntrinsicSize(nsIRenderingContext *aRenderingContext) nsVideoFrame::GetVideoIntrinsicSize(nsIRenderingContext *aRenderingContext)
{ {
// Defaulting size to 300x150 if no size given. // Defaulting size to 300x150 if no size given.
nsIntSize size(300,150); nsIntSize size(300, 150);
if (ShouldDisplayPoster()) { if (ShouldDisplayPoster()) {
// Use the poster image frame's size. // Use the poster image frame's size.
@@ -528,7 +528,7 @@ nsVideoFrame::GetVideoIntrinsicSize(nsIRenderingContext *aRenderingContext)
} }
} }
if (!HasVideoData()) { if (!HasVideoElement()) {
if (!aRenderingContext || !mFrames.FirstChild()) { if (!aRenderingContext || !mFrames.FirstChild()) {
// We just want our intrinsic ratio, but audio elements need no // We just want our intrinsic ratio, but audio elements need no
// intrinsic ratio, so just return "no ratio". Also, if there's // intrinsic ratio, so just return "no ratio". Also, if there's