wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 534409 - Fix incorrect sizing of the <audio> element when it has a non-auto width or height. r=doublec

Browse Source
This commit is contained in:
Michael Harrison 2013-06-25 18:00:04 -04:00
parent 6ac5667830
commit 04aac710fc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/generic/nsVideoFrame.cpp
View File

@ -503,7 +503,8 @@ nsSize nsVideoFrame::ComputeSize(nsRenderingContext *aRenderingContext,
intrinsicSize.width.SetCoordValue(size.width);
intrinsicSize.height.SetCoordValue(size.height);
nsSize& intrinsicRatio = size; // won't actually be used
// Only video elements have an intrinsic ratio.
nsSize intrinsicRatio = HasVideoElement() ? size : nsSize(0, 0);
return nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(aRenderingContext,
this,
@ -531,6 +532,11 @@ nscoord nsVideoFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
nsSize nsVideoFrame::GetIntrinsicRatio()
{
if (!HasVideoElement()) {
// Audio elements have no intrinsic ratio.
return nsSize(0, 0);
}
return GetVideoIntrinsicSize(nullptr);
}
@ -566,12 +572,9 @@ nsVideoFrame::GetVideoIntrinsicSize(nsRenderingContext *aRenderingContext)
{
// Defaulting size to 300x150 if no size given.
nsIntSize size(300, 150);
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.
if (!mFrames.FirstChild()) {
return nsSize(0, 0);
}