From b3806e256d7a41c3fe6ee2fc5d58733cdf25de5c Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Mon, 14 Mar 2016 14:07:31 -0400 Subject: [PATCH] Bug 1216924 - Don't align to tiles (either real or virtual) if displayport suppression is enabled. r=BenWa MozReview-Commit-ID: 15XWTTM0tZI --- layout/base/nsLayoutUtils.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 2357c9f17aaa..ba5eb5619f49 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -950,7 +950,9 @@ GetDisplayPortFromMarginsData(nsIContent* aContent, // the choosing of the resolution to display-list building time. ScreenSize alignment; - if (gfxPrefs::LayersTilesEnabled() && !APZCCallbackHelper::IsDisplayportSuppressed()) { + if (APZCCallbackHelper::IsDisplayportSuppressed()) { + alignment = ScreenSize(1, 1); + } else if (gfxPrefs::LayersTilesEnabled()) { alignment = ScreenSize(gfxPlatform::GetPlatform()->GetTileWidth(), gfxPlatform::GetPlatform()->GetTileHeight()); } else {