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 91419 patch 4: Rename everything with IBSpecialSibling to IBSplitSibling. r=mats

Browse Source
This commit is contained in:
L. David Baron 2014-02-06 17:45:30 -08:00
parent d323811d0a
commit b2713a05ff
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsFrame.cpp
View File

@ -7170,11 +7170,11 @@ nsFrame::ConsiderChildOverflow(nsOverflowAreas& aOverflowAreas,
* If aFrame is not an anonymous block, null is returned. * If aFrame is not an anonymous block, null is returned.
*/ */
static nsIFrame* static nsIFrame*
GetIBSpecialSiblingForAnonymousBlock(const nsIFrame* aFrame) GetIBSplitSiblingForAnonymousBlock(const nsIFrame* aFrame)
{ {
NS_PRECONDITION(aFrame, "Must have a non-null frame!"); NS_PRECONDITION(aFrame, "Must have a non-null frame!");
NS_ASSERTION(aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT, NS_ASSERTION(aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT,
"GetIBSpecialSibling should not be called on a non-special frame"); "GetIBSplitSibling should not be called on a non-special frame");
nsIAtom* type = aFrame->StyleContext()->GetPseudo(); nsIAtom* type = aFrame->StyleContext()->GetPseudo();
if (type != nsCSSAnonBoxes::mozAnonymousBlock && if (type != nsCSSAnonBoxes::mozAnonymousBlock &&
@ -7249,7 +7249,7 @@ nsFrame::CorrectStyleParentFrame(nsIFrame* aProspectiveParent,
nsIFrame* parent = aProspectiveParent; nsIFrame* parent = aProspectiveParent;
do { do {
if (parent->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT) { if (parent->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT) {
nsIFrame* sibling = GetIBSpecialSiblingForAnonymousBlock(parent); nsIFrame* sibling = GetIBSplitSiblingForAnonymousBlock(parent);
if (sibling) { if (sibling) {
// |parent| was a block in an {ib} split; use the inline as // |parent| was a block in an {ib} split; use the inline as
@ -7300,10 +7300,10 @@ nsFrame::DoGetParentStyleContextFrame() const
/* /*
* If this frame is an anonymous block created when an inline with a block * If this frame is an anonymous block created when an inline with a block
* inside it got split, then the parent style context is on its preceding * inside it got split, then the parent style context is on its preceding
* inline. We can get to it using GetIBSpecialSiblingForAnonymousBlock. * inline. We can get to it using GetIBSplitSiblingForAnonymousBlock.
*/ */
if (mState & NS_FRAME_PART_OF_IBSPLIT) { if (mState & NS_FRAME_PART_OF_IBSPLIT) {
nsIFrame* specialSibling = GetIBSpecialSiblingForAnonymousBlock(this); nsIFrame* specialSibling = GetIBSplitSiblingForAnonymousBlock(this);
if (specialSibling) { if (specialSibling) {
return specialSibling; return specialSibling;
} }