mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-05 03:54:35 +00:00
Bug 681192. Part 15: Fix test now that scrollbox scrollWidth/Heights isn't special. r=matspal
--HG-- extra : rebase_source : d77548c8b7b2c62a66070a4cd8414cdf1f7819e6
This commit is contained in:
parent
390dee1351
commit
f8e0bb41da
@ -32,11 +32,6 @@ function toNearestAppunit(v)
|
||||
return Math.round(v*60)/60;
|
||||
}
|
||||
|
||||
function floorToNearestAppunit(v)
|
||||
{
|
||||
return Math.floor(toNearestAppunit(v));
|
||||
}
|
||||
|
||||
function isEqualAppunits(a, b, msg)
|
||||
{
|
||||
is(toNearestAppunit(a), toNearestAppunit(b), msg);
|
||||
@ -67,11 +62,11 @@ function testElement(element)
|
||||
var scrollWidth, scrollHeight, clientWidth, clientHeight;
|
||||
if (element.id == "scrollbox") {
|
||||
var lastchild = $("lastline");
|
||||
scrollWidth = floorToNearestAppunit(lastchild.getBoundingClientRect().width + paddingLeft + paddingRight);
|
||||
scrollWidth = lastchild.getBoundingClientRect().width + paddingLeft + paddingRight;
|
||||
var top = element.firstChild.getBoundingClientRect().top;
|
||||
var bottom = element.lastChild.getBoundingClientRect().bottom;
|
||||
var contentsHeight = bottom - top;
|
||||
scrollHeight = floorToNearestAppunit(contentsHeight + paddingTop + paddingBottom);
|
||||
scrollHeight = contentsHeight + paddingTop + paddingBottom;
|
||||
clientWidth = paddingLeft + width + paddingRight - scrollbarWidth;
|
||||
clientHeight = paddingTop + height + paddingBottom - scrollbarHeight;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user