Bug 1136914 - Don't lose scale from parent document when descending into subdocument. r=tn

--HG--
extra : rebase_source : 9df0d3585a615b8869c134571aaf5b55812b1592
This commit is contained in:
Botond Ballo 2015-02-27 15:36:31 -05:00
parent f34ad1a424
commit 08a367dfcc

View File

@ -4193,8 +4193,10 @@ nsDisplaySubDocument::ComputeFrameMetrics(Layer* aLayer,
nsIFrame* rootScrollFrame = presContext->PresShell()->GetRootScrollFrame();
bool isRootContentDocument = presContext->IsRootContentDocument();
nsIPresShell* presShell = presContext->PresShell();
ContainerLayerParameters params(presShell->GetXResolution(),
presShell->GetYResolution(), nsIntPoint(), aContainerParameters);
ContainerLayerParameters params(
aContainerParameters.mXScale * presShell->GetXResolution(),
aContainerParameters.mYScale * presShell->GetYResolution(),
nsIntPoint(), aContainerParameters);
if ((mFlags & GENERATE_SCROLLABLE_LAYER) &&
rootScrollFrame->GetContent() &&
nsLayoutUtils::GetCriticalDisplayPort(rootScrollFrame->GetContent(), nullptr)) {