From f8e0bb41da1c8912ea598d7f7870e88085924e2f Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Thu, 10 May 2012 17:24:20 +1200 Subject: [PATCH] Bug 681192. Part 15: Fix test now that scrollbox scrollWidth/Heights isn't special. r=matspal --HG-- extra : rebase_source : d77548c8b7b2c62a66070a4cd8414cdf1f7819e6 --- dom/tests/mochitest/general/test_offsets.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dom/tests/mochitest/general/test_offsets.js b/dom/tests/mochitest/general/test_offsets.js index c1884940a9c9..5a40c1915d4f 100644 --- a/dom/tests/mochitest/general/test_offsets.js +++ b/dom/tests/mochitest/general/test_offsets.js @@ -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; }