Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-24 16:54:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4f0d8916386e (bug 962791) for causing various regressions.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-01-31 20:40:29 -05:00
parent 05466622ef
commit a52f4d9d32
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/generic/nsGfxScrollFrame.cpp
View File

@ -2188,17 +2188,8 @@ public:
virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem) {
// If the display item is for a frame that is absolutely positioned, it
// should only scroll with the scrolled content if its frame its contained
// within the scrolled content's frame.
bool shouldWrap = !aItem->Frame()->IsAbsolutelyPositioned() ||
nsLayoutUtils::IsProperAncestorFrame(mScrolledFrame, aItem->Frame(), nullptr);
if (shouldWrap) {
SetCount(++mCount);
return new (aBuilder) nsDisplayScrollLayer(aBuilder, aItem, aItem->Frame(), mScrolledFrame, mScrollFrame);
} else {
return aItem;
}
SetCount(++mCount);
return new (aBuilder) nsDisplayScrollLayer(aBuilder, aItem, aItem->Frame(), mScrolledFrame, mScrollFrame);
}
protected: