Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 0d582c239872 (bug 1271714) for test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-07-13 09:44:45 +02:00
parent edd0c6d29f
commit c3393c7dd8
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/DisplayListClipState.cpp
View File

@ -197,8 +197,6 @@ DisplayListClipState::AutoSaveRestore::AutoSaveRestore(nsDisplayListBuilder* aBu
, mRestored(false)
#endif
, mClearedForStackingContextContents(false)
{
mState.mStackingContextAncestorSC = mState.GetCurrentInnermostScrollClip();
}
{}
} // namespace mozilla

14
layout/generic/nsFrame.cpp
View File

@ -2599,8 +2599,7 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
static nsDisplayItem*
WrapInWrapList(nsDisplayListBuilder* aBuilder,
nsIFrame* aFrame, nsDisplayList* aList,
const DisplayItemScrollClip* aScrollClip)
nsIFrame* aFrame, nsDisplayList* aList)
{
nsDisplayItem* item = aList->GetBottom();
if (!item) {
@ -2618,7 +2617,7 @@ WrapInWrapList(nsDisplayListBuilder* aBuilder,
}
if (item->GetAbove() || itemFrame != aFrame) {
return new (aBuilder) nsDisplayWrapList(aBuilder, aFrame, aList, aScrollClip);
return new (aBuilder) nsDisplayWrapList(aBuilder, aFrame, aList);
}
aList->RemoveBottom();
return item;
@ -2909,20 +2908,17 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
}
buildingForChild.RestoreBuildingInvisibleItemsValue();
// Clear clip rect for the construction of the items below. Since we're
// clipping all their contents, they themselves don't need to be clipped.
clipState.Clear();
const DisplayItemScrollClip* containerItemScrollClip =
aBuilder->ClipState().CurrentAncestorScrollClipForStackingContextContents();
if (isPositioned || isVisuallyAtomic ||
(aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
// Genuine stacking contexts, and positioned pseudo-stacking-contexts,
// go in this level.
if (!list.IsEmpty()) {
nsDisplayItem* item = WrapInWrapList(aBuilder, child, &list, containerItemScrollClip);
nsDisplayItem* item = WrapInWrapList(aBuilder, child, &list);
if (isSVG) {
aLists.Content()->AppendNewToTop(item);
} else {
@ -2931,7 +2927,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
}
} else if (!isSVG && disp->IsFloating(child)) {
if (!list.IsEmpty()) {
aLists.Floats()->AppendNewToTop(WrapInWrapList(aBuilder, child, &list, containerItemScrollClip));
aLists.Floats()->AppendNewToTop(WrapInWrapList(aBuilder, child, &list));
}
} else {
aLists.Content()->AppendToTop(&list);