Backed out changeset 622e87797446 (bug 1254273)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 11 Mar 2016 20:33:35 +0100
changeset 339601 da961dd18d914695ebff4f35eb19d36e3fa665fa
parent 339600 ce018c5ee5c15e76c640f0c0e2414ab7c6a04657
child 339602 29f0eadfe98255e168f0cba5d83cd73b62bb3314
push id12762
push userbmo:rail@mozilla.com
push dateFri, 11 Mar 2016 19:47:45 +0000
bugs1254273
milestone48.0a1
backs out622e8779744631d6a6a8e445ee4325717b392f6b
Backed out changeset 622e87797446 (bug 1254273)
layout/base/nsLayoutUtils.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -946,21 +946,18 @@ GetDisplayPortFromMarginsData(nsIContent
   //   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()) {
-    // Don't align to tiles if they are too large, because we could expand
-    // the displayport by a lot which can take more paint time. It's a tradeoff
-    // though because if we don't align to tiles we have more waste on upload.
-    alignment = ScreenSize(std::min(256, gfxPlatform::GetPlatform()->GetTileWidth()),
-                           std::min(256, gfxPlatform::GetPlatform()->GetTileHeight()));
+    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);
   }
 
   // Avoid division by zero.