Backed out changeset 21884d000ede (bug 1216924) for mochitest failures. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 11 Mar 2016 20:35:45 +0100
changeset 339602 29f0eadfe98255e168f0cba5d83cd73b62bb3314
parent 339601 da961dd18d914695ebff4f35eb19d36e3fa665fa
child 339603 6a89a3c368939ea2ac06301e3df821236ac3dbb2
push id12762
push userbmo:rail@mozilla.com
push dateFri, 11 Mar 2016 19:47:45 +0000
reviewersbackout
bugs1216924
milestone48.0a1
backs out21884d000eded02b02e4c221ba9f80ac03fe53f6
Backed out changeset 21884d000ede (bug 1216924) for mochitest failures. r=backout
layout/base/nsLayoutUtils.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -943,19 +943,17 @@ GetDisplayPortFromMarginsData(nsIContent
   //   render (it chooses that in FrameLayerBuilder, but this can be called
   //   during display list building). Therefore, we perform the alignment in
   //   Screen space, which basically assumes that Layout chose to render at
   //   screen resolution; since this is what Layout does most of the time,
   //   this is a good approximation. A proper solution would involve moving
   //   the choosing of the resolution to display-list building time.
   ScreenSize alignment;
 
-  if (APZCCallbackHelper::IsDisplayportSuppressed()) {
-    alignment = ScreenSize(1, 1);
-  } else if (gfxPrefs::LayersTilesEnabled()) {
+  if (gfxPrefs::LayersTilesEnabled() && !APZCCallbackHelper::IsDisplayportSuppressed()) {
     alignment = ScreenSize(gfxPlatform::GetPlatform()->GetTileWidth(),
                            gfxPlatform::GetPlatform()->GetTileHeight());
   } else {
     // If we're not drawing with tiles then we need to be careful about not
     // hitting the max texture size and we only need 1 draw call per layer
     // so we can align to a smaller multiple.
     alignment = ScreenSize(128, 128);
   }