Back out changeset 61baabe617c9 (bug 1191539) because of regressions like bug 1205863 and probably bug 1206209.
authorMarkus Stange <mstange@themasta.com>
Sun, 20 Sep 2015 01:14:15 +0200
changeset 297744 6e112d30103e1f13d93f3380d83c50485b30b172
parent 297743 4ef727eb2cce5ea61af11489096576772be0d7b7
child 297745 2b6a3ec30a149c1142ac390fd5e5bf3e7a34a2e1
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1191539, 1205863, 1206209
milestone43.0a1
backs out61baabe617c9786b3ce315709a39fa17e78b15fc
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out changeset 61baabe617c9 (bug 1191539) because of regressions like bug 1205863 and probably bug 1206209.
layout/base/nsLayoutUtils.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -956,18 +956,18 @@ GetDisplayPortFromMarginsData(nsIContent
 
     ScreenPoint scrollPosScreen = LayoutDevicePoint::FromAppUnits(scrollPos, auPerDevPixel)
                                 * res;
 
     screenRect += scrollPosScreen;
     // Round-out the display port to the nearest alignment (tiles)
     float x = alignmentX * floor(screenRect.x / alignmentX);
     float y = alignmentY * floor(screenRect.y / alignmentY);
-    float w = alignmentX * ceil(screenRect.width / alignmentX);
-    float h = alignmentY * ceil(screenRect.height / alignmentY);
+    float w = alignmentX * ceil(screenRect.width / alignmentX + 1);
+    float h = alignmentY * ceil(screenRect.height / alignmentY + 1);
     screenRect = ScreenRect(x, y, w, h);
     screenRect -= scrollPosScreen;
 
     ScreenRect screenExpScrollableRect =
       LayoutDeviceRect::FromAppUnits(expandedScrollableRect,
                                      auPerDevPixel) * res;
 
     // Make sure the displayport remains within the scrollable rect.