Bug 1099298 - Revert the temporary fix in bug 1099104. r=tn
authorBotond Ballo <botond@mozilla.com>
Fri, 21 Nov 2014 13:52:49 -0500
changeset 241324 72a9b9b54acc3d27614f96647d0d00dfcc409758
parent 241323 a5271ded6fff270f4512e4c93747792a9bc6c603
child 241325 5bf604e8b8d734d3759a1fb63a73fc98f2806c3f
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstn
bugs1099298, 1099104
milestone36.0a1
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
Bug 1099298 - Revert the temporary fix in bug 1099104. r=tn
layout/base/nsDisplayList.cpp
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -742,25 +742,18 @@ nsDisplayScrollLayer::ComputeFrameMetric
   } else {
     metrics.mPresShellResolution = 1.0f;
   }
   // The cumulative resolution is the resolution at which the scroll frame's
   // content is actually rendered. It includes the pres shell resolutions of
   // all the pres shells from here up to the root, as well as any css-driven
   // resolution. We don't need to compute it as it's already stored in the
   // container parameters.
-  // TODO: On Fennec, the container parameters do not appear to contain the
-  // cumulative resolution the way they do on B2G, and using them breaks
-  // rendering for normal pages (no CSS transform involves). As a temporary
-  // workaround, use the same value as the resolution-to-screen; this will make
-  // the "extra resolution" 1, and pages with CSS transforms may not be
-  // rendered correctly, but normal pages will.
-  metrics.mCumulativeResolution = LayoutDeviceToLayerScale(
-      presShell->GetCumulativeResolution().width
-    * nsLayoutUtils::GetTransformToAncestorScale(aScrollFrame ? aScrollFrame : aForFrame).width);
+  metrics.mCumulativeResolution = LayoutDeviceToLayerScale(aContainerParameters.mXScale,
+                                                           aContainerParameters.mYScale);
 
   LayoutDeviceToScreenScale resolutionToScreen(
       presShell->GetCumulativeResolution().width
     * nsLayoutUtils::GetTransformToAncestorScale(aScrollFrame ? aScrollFrame : aForFrame).width);
   metrics.SetExtraResolution(metrics.mCumulativeResolution / resolutionToScreen);
 
   metrics.mDevPixelsPerCSSPixel = CSSToLayoutDeviceScale(
     (float)nsPresContext::AppUnitsPerCSSPixel() / auPerDevPixel);