From 55dc07e248a00dd5a4934d7f20f45b76b365e872 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Mon, 16 Dec 2013 17:33:30 -0500 Subject: [PATCH] Bug 943846 - Don't constrain generated display-ports to composition bounds. r=kats --- gfx/layers/ipc/AsyncPanZoomController.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp index bd0a4c608a86..8226ca658db5 100644 --- a/gfx/layers/ipc/AsyncPanZoomController.cpp +++ b/gfx/layers/ipc/AsyncPanZoomController.cpp @@ -1213,21 +1213,6 @@ const CSSRect AsyncPanZoomController::CalculatePendingDisplayPort( scrollOffset.y = scrollableRect.y; } - // FIXME/bug 936500: Make sure the displayport contains the composition - // bounds. This is to work around a layout bug that means if a display item's - // corresponding displayport doesn't contain its frame's bounds, it may get - // optimised out and the layer won't get created. - if (displayPort.x + displayPort.width < compositionBounds.width) { - displayPort.x = -(displayPort.width - compositionBounds.width); - } else if (displayPort.x > 0) { - displayPort.x = 0; - } - if (displayPort.y + displayPort.height < compositionBounds.height) { - displayPort.y = -(displayPort.height - compositionBounds.height); - } else if (displayPort.y > 0) { - displayPort.y = 0; - } - CSSRect shiftedDisplayPort = displayPort + scrollOffset; return scrollableRect.ClampRect(shiftedDisplayPort) - scrollOffset; }