Commit f8e0bb41 authored by Robert O'Callahan's avatar Robert O'Callahan
Browse files

Bug 681192. Part 15: Fix test now that scrollbox scrollWidth/Heights isn't special. r=matspal 

--HG--
extra : rebase_source : d77548c8b7b2c62a66070a4cd8414cdf1f7819e6
parent 390dee13

dom/tests/mochitest/general/test_offsets.js

+2 −7
Original line number Diff line number Diff line
@@ -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;

  }