Bug 1071018 - Work around an assertion (will be fixed properly in bug 1036967). r=kats

This commit is contained in:
Botond Ballo 2015-02-25 18:30:46 -05:00
parent ff515eace1
commit 0b5574410b

View File

@ -802,8 +802,10 @@ nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame,
// all the pres shells from here up to the root, as well as any css-driven // 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 // resolution. We don't need to compute it as it's already stored in the
// container parameters. // container parameters.
metrics.SetCumulativeResolution(LayoutDeviceToLayerScale(aContainerParameters.mXScale, // TODO(botond): As a workaround for bug 1071018, avoid asserting if
aContainerParameters.mYScale)); // mYScale is different from mXScale. This will be handled properly in
// bug 1036967.
metrics.SetCumulativeResolution(LayoutDeviceToLayerScale(aContainerParameters.mXScale));
LayoutDeviceToScreenScale resolutionToScreen( LayoutDeviceToScreenScale resolutionToScreen(
presShell->GetCumulativeResolution().width presShell->GetCumulativeResolution().width