Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 91419 patch 8: Miscellaneous function and variable name changes. r=mats

Browse Source
This commit is contained in:
L. David Baron 2014-02-06 17:45:32 -08:00
parent 9a62684661
commit f47695e72d
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/base/nsCSSFrameConstructor.cpp
View File

@ -456,7 +456,7 @@ GetLastIBSplitSibling(nsIFrame* aFrame, bool aReturnEmptyTrailingInline)
}
static void
SetFrameIsSpecial(nsIFrame* aFrame, nsIFrame* aIBSplitSibling)
SetFrameIsIBSplit(nsIFrame* aFrame, nsIFrame* aIBSplitSibling)
{
NS_PRECONDITION(aFrame, "bad args!");
@ -6639,8 +6639,8 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
// If the frame we are manipulating is a ``special'' frame (that is, one
// that's been created as a result of a block-in-inline situation) then we
// need to append to the last special sibling, not to the frame itself.
bool parentSpecial = IsFramePartOfIBSplit(parentFrame);
if (parentSpecial) {
bool parentIBSplit = IsFramePartOfIBSplit(parentFrame);
if (parentIBSplit) {
#ifdef DEBUG
if (gNoisyContentUpdates) {
printf("nsCSSFrameConstructor::ContentAppended: parentFrame=");
@ -6740,7 +6740,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
// where frames can be moved around, determine if the list is for the
// start or end of the block.
if (nsLayoutUtils::GetAsBlock(parentFrame) && !haveFirstLetterStyle &&
!haveFirstLineStyle && !parentSpecial) {
!haveFirstLineStyle && !parentIBSplit) {
items.SetLineBoundaryAtStart(!prevSibling ||
!prevSibling->IsInlineOutside() ||
prevSibling->GetType() == nsGkAtoms::brFrame);
@ -10559,7 +10559,7 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState,
MoveChildrenTo(aState.mPresContext, aInitialInline, blockFrame, blockKids);
SetFrameIsSpecial(lastNewInline, blockFrame);
SetFrameIsIBSplit(lastNewInline, blockFrame);
aSiblings.AddChild(blockFrame);
// Now grab the initial inlines in aChildItems and put them into an inline
@ -10583,12 +10583,12 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState,
inlineKids);
}
SetFrameIsSpecial(blockFrame, inlineFrame);
SetFrameIsIBSplit(blockFrame, inlineFrame);
aSiblings.AddChild(inlineFrame);
lastNewInline = inlineFrame;
} while (aChildItems.NotEmpty());
SetFrameIsSpecial(lastNewInline, nullptr);
SetFrameIsIBSplit(lastNewInline, nullptr);
}
void
@ -10695,7 +10695,7 @@ nsCSSFrameConstructor::BuildInlineChildItems(nsFrameConstructorState& aState,
// aParentFrame if our nextSibling is aNextSibling. aParentFrame must
// be an {ib} special inline.
static bool
IsSafeToAppendToSpecialInline(nsIFrame* aParentFrame, nsIFrame* aNextSibling)
IsSafeToAppendToIBSplitInline(nsIFrame* aParentFrame, nsIFrame* aNextSibling)
{
NS_PRECONDITION(IsInlineFrame(aParentFrame),
"Must have an inline parent here");
@ -10987,7 +10987,7 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
// last part of their {ib} splits and we'd be adding to the end for all
// of them), then AppendFrames will handle things for us. Bail out in
// that case.
if (aIsAppend && IsSafeToAppendToSpecialInline(aFrame, nextSibling)) {
if (aIsAppend && IsSafeToAppendToIBSplitInline(aFrame, nextSibling)) {
return false;
}

2
layout/base/nsCSSFrameConstructor.h
View File

@ -1552,7 +1552,7 @@ private:
* will be empty.
* @param aSiblings the nsFrameItems to put the newly-created siblings into.
*
* This method is responsible for making any SetFrameIsSpecial calls that are
* This method is responsible for making any SetFrameIsIBSplit calls that are
* needed.
*/
void CreateIBSiblings(nsFrameConstructorState& aState,

12
layout/generic/nsFrame.cpp
View File

@ -7191,10 +7191,10 @@ GetIBSplitSiblingForAnonymousBlock(const nsIFrame* aFrame)
* Now look up the nsGkAtoms::IBSplitPrevSibling
* property.
*/
nsIFrame *specialSibling = static_cast<nsIFrame*>
nsIFrame *ibSplitSibling = static_cast<nsIFrame*>
(aFrame->Properties().Get(nsIFrame::IBSplitPrevSibling()));
NS_ASSERTION(specialSibling, "Broken frame tree?");
return specialSibling;
NS_ASSERTION(ibSplitSibling, "Broken frame tree?");
return ibSplitSibling;
}
/**
@ -7303,9 +7303,9 @@ nsFrame::DoGetParentStyleContextFrame() const
* inline. We can get to it using GetIBSplitSiblingForAnonymousBlock.
*/
if (mState & NS_FRAME_PART_OF_IBSPLIT) {
nsIFrame* specialSibling = GetIBSplitSiblingForAnonymousBlock(this);
if (specialSibling) {
return specialSibling;
nsIFrame* ibSplitSibling = GetIBSplitSiblingForAnonymousBlock(this);
if (ibSplitSibling) {
return ibSplitSibling;
}
}