wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 847208 - Make RemoveFloat() check the PushedFloatsList too. r=dbaron

Browse Source
This commit is contained in:
Mats Palmgren 2013-03-14 14:39:26 +01:00
parent 13657dc37c
commit ef5ba27916
5 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/base/nsLayoutUtils.cpp
View File

@ -621,8 +621,7 @@ nsLayoutUtils::GetChildListNameFor(nsIFrame* aChildFrame)
return nsIFrame::kPopupList;
#endif // MOZ_XUL
} else {
NS_ASSERTION(aChildFrame->IsFloating(),
"not a floated frame");
NS_ASSERTION(aChildFrame->IsFloating(), "not a floated frame");
id = nsIFrame::kFloatList;
}
@ -660,6 +659,10 @@ nsLayoutUtils::GetChildListNameFor(nsIFrame* aChildFrame)
else if (aChildFrame->IsFloating()) {
found = parent->GetChildList(nsIFrame::kOverflowOutOfFlowList)
.ContainsFrame(aChildFrame);
if (!found) {
found = parent->GetChildList(nsIFrame::kPushedFloatsList)
.ContainsFrame(aChildFrame);
}
}
// else it's positioned and should have been on the 'id' child list.
NS_POSTCONDITION(found, "not in child list");

16
layout/generic/crashtests/847208.html Normal file
View File

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<style>
.f:first-letter {
float: left;
}
.f {
page-break-inside: avoid; float: left;
}
</style>
</head>
<body onload="document.getElementById('p').className = '';">
<p id="p" class="f">text</p>
</body>
</html>

1
layout/generic/crashtests/crashtests.list
View File

@ -448,3 +448,4 @@ test-pref(layout.css.flexbox.enabled,true) load 827168-1.html
load 842132-1.html
test-pref(layout.css.flexbox.enabled,true) load 844529-1.html
load 847130.xhtml
load 847208.html

41
layout/generic/nsBlockFrame.cpp
View File

@ -4954,16 +4954,8 @@ nsBlockFrame::AddFrames(nsFrameList& aFrameList, nsIFrame* aPrevSibling)
}
void
nsBlockFrame::RemoveFloat(nsIFrame* aFloat)
nsBlockFrame::RemoveFloatFromFloatCache(nsIFrame* aFloat)
{
#ifdef DEBUG
if (!mFloats.ContainsFrame(aFloat)) {
MOZ_ASSERT(GetOverflowOutOfFlows() &&
GetOverflowOutOfFlows()->ContainsFrame(aFloat),
"aFloat is not our child or on an unexpected frame list");
}
#endif
// Find which line contains the float, so we can update
// the float cache.
line_iterator line = begin_lines(), line_end = end_lines();
@ -4972,19 +4964,45 @@ nsBlockFrame::RemoveFloat(nsIFrame* aFloat)
break;
}
}
}
void
nsBlockFrame::RemoveFloat(nsIFrame* aFloat)
{
#ifdef DEBUG
// Floats live in mFloats, or in the PushedFloat or OverflowOutOfFlows
// frame list properties.
if (!mFloats.ContainsFrame(aFloat)) {
MOZ_ASSERT((GetOverflowOutOfFlows() &&
GetOverflowOutOfFlows()->ContainsFrame(aFloat)) ||
(GetPushedFloats() &&
GetPushedFloats()->ContainsFrame(aFloat)),
"aFloat is not our child or on an unexpected frame list");
}
#endif
if (mFloats.StartRemoveFrame(aFloat)) {
return;
}
nsFrameList* list = GetPushedFloats();
if (list && list->ContinueRemoveFrame(aFloat)) {
#if 0
// XXXmats not yet - need to investigate nsBlockReflowState::mPushedFloats
// first so we don't leave it pointing to a deleted list.
if (list->IsEmpty()) {
delete RemovePushedFloats();
}
#endif
return;
}
{
nsAutoOOFFrameList oofs(this);
if (oofs.mList.ContinueRemoveFrame(aFloat)) {
return;
}
}
MOZ_ASSERT(false, "float child frame not found");
}
static void MarkSameFloatManagerLinesDirty(nsBlockFrame* aBlock)
@ -5103,6 +5121,7 @@ nsBlockFrame::DoRemoveOutOfFlowFrame(nsIFrame* aFrame)
->DeleteNextInFlowChild(aFrame->PresContext(), nif, false);
}
// Now remove aFrame from its child list and Destroy it.
block->RemoveFloatFromFloatCache(aFrame);
block->RemoveFloat(aFrame);
aFrame->Destroy();
}

9
layout/generic/nsBlockFrame.h
View File

@ -518,10 +518,13 @@ protected:
uint8_t FindTrailingClear();
/**
* Remove a float from our float list and also the float cache
* for the line its placeholder is on.
*/
* Remove a float from our float list.
*/
void RemoveFloat(nsIFrame* aFloat);
/**
* Remove a float from the float cache for the line its placeholder is on.
*/
void RemoveFloatFromFloatCache(nsIFrame* aFloat);
void CollectFloats(nsIFrame* aFrame, nsFrameList& aList,
bool aCollectFromSiblings) {