Bug 1022612. Part 17: RecordFrameMetrics should not set layer visible regions. r=mattwoodrow

This is unnecessary. FrameLayerBuilder sets the correct region.

--HG--
extra : rebase_source : 45ed3e76905a37d1099af8dd907fa86061b5a867
This commit is contained in:
Robert O'Callahan 2014-06-11 23:12:14 +12:00
Родитель 25f6b81c90
Коммит 93aa1d7155
1 изменённых файлов: 3 добавлений и 9 удалений

Просмотреть файл

@ -616,7 +616,6 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
nsIFrame* aScrollFrame,
const nsIFrame* aReferenceFrame,
ContainerLayer* aRoot,
const nsRect& aVisibleRect,
const nsRect& aViewport,
bool aForceNullScrollId,
bool aIsRoot,
@ -625,10 +624,6 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
int32_t auPerDevPixel = presContext->AppUnitsPerDevPixel();
LayoutDeviceToLayerScale resolution(aContainerParameters.mXScale, aContainerParameters.mYScale);
nsIntRect visible = aVisibleRect.ScaleToNearestPixels(
resolution.scale, resolution.scale, auPerDevPixel);
aRoot->SetVisibleRegion(visible);
nsIPresShell* presShell = presContext->GetPresShell();
FrameMetrics metrics;
metrics.mViewport = CSSRect::FromAppUnits(aViewport);
@ -1365,7 +1360,7 @@ void nsDisplayList::PaintForFrame(nsDisplayListBuilder* aBuilder,
RecordFrameMetrics(aForFrame, rootScrollFrame,
aBuilder->FindReferenceFrameFor(aForFrame),
root, mVisibleRect, viewport,
root, viewport,
!isRoot, isRoot, containerParameters);
if (usingDisplayport &&
!(root->GetContentFlags() & Layer::CONTENT_OPAQUE)) {
@ -3633,7 +3628,7 @@ nsDisplaySubDocument::BuildLayer(nsDisplayListBuilder* aBuilder,
container->SetScrollHandoffParentId(mScrollParentId);
RecordFrameMetrics(mFrame, rootScrollFrame, ReferenceFrame(),
container, mList.GetVisibleRect(), viewport,
container, viewport,
false, isRootContentDocument, aContainerParameters);
}
@ -3912,8 +3907,7 @@ nsDisplayScrollLayer::BuildLayer(nsDisplayListBuilder* aBuilder,
layer->SetScrollHandoffParentId(mScrollParentId);
RecordFrameMetrics(mScrolledFrame, mScrollFrame, ReferenceFrame(), layer,
mList.GetVisibleRect(), viewport,
false, false, aContainerParameters);
viewport, false, false, aContainerParameters);
return layer.forget();
}