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 6: Rename everything with IBSplitSpecialPrevSibling to IBSplitPrevSibling. r=mats

Browse Source
This commit is contained in:
L. David Baron 2014-02-06 17:45:31 -08:00
parent 98ca7cd11c
commit edc948d350
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/RestyleManager.cpp
View File

@ -1789,10 +1789,10 @@ GetPrevContinuationWithPossiblySameStyle(nsIFrame* aFrame)
// We're the first continuation, so we can just get the frame
// property directly
prevContinuation = static_cast<nsIFrame*>(
aFrame->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
aFrame->Properties().Get(nsIFrame::IBSplitPrevSibling()));
if (prevContinuation) {
prevContinuation = static_cast<nsIFrame*>(
prevContinuation->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
prevContinuation->Properties().Get(nsIFrame::IBSplitPrevSibling()));
}
}

6
layout/base/nsCSSFrameConstructor.cpp
View File

@ -435,7 +435,7 @@ static nsIFrame* GetSpecialPrevSibling(nsIFrame* aFrame)
// frame in the continuation chain. Walk back to find that frame now.
return static_cast<nsIFrame*>
(aFrame->FirstContinuation()->
Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
Properties().Get(nsIFrame::IBSplitPrevSibling()));
}
static nsIFrame*
@ -479,7 +479,7 @@ SetFrameIsSpecial(nsIFrame* aFrame, nsIFrame* aIBSplitSibling)
// first frame in the flow.
FramePropertyTable* props = aFrame->PresContext()->PropertyTable();
props->Set(aFrame, nsIFrame::IBSplitSibling(), aIBSplitSibling);
props->Set(aIBSplitSibling, nsIFrame::IBSplitSpecialPrevSibling(), aFrame);
props->Set(aIBSplitSibling, nsIFrame::IBSplitPrevSibling(), aFrame);
}
}
@ -10406,7 +10406,7 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
// 2) Each frame in the split has the nsIFrame::IBSplitSibling
// property pointing to the next frame in the split, except for the last
// one, which does not have it set.
// 3) Each frame in the split has the nsIFrame::IBSplitSpecialPrevSibling
// 3) Each frame in the split has the nsIFrame::IBSplitPrevSibling
// property pointing to the previous frame in the split, except for the
// first one, which does not have it set.
// 4) The first and last frame in the split are always inlines.

6
layout/base/nsCSSRendering.cpp
View File

@ -203,13 +203,13 @@ protected:
if (!prevCont &&
(aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT)) {
nsIFrame* block = static_cast<nsIFrame*>
(aFrame->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
(aFrame->Properties().Get(nsIFrame::IBSplitPrevSibling()));
if (block) {
// The {ib} properties are only stored on first continuations
NS_ASSERTION(!block->GetPrevContinuation(),
"Incorrect value for IBSplitSpecialPrevSibling");
"Incorrect value for IBSplitPrevSibling");
prevCont = static_cast<nsIFrame*>
(block->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
(block->Properties().Get(nsIFrame::IBSplitPrevSibling()));
NS_ASSERTION(prevCont, "How did that happen?");
}
}

4
layout/base/nsLayoutUtils.cpp
View File

@ -2746,7 +2746,7 @@ nsLayoutUtils::FirstContinuationOrIBSplitSibling(nsIFrame *aFrame)
if (result->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT) {
while (true) {
nsIFrame *f = static_cast<nsIFrame*>
(result->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
(result->Properties().Get(nsIFrame::IBSplitPrevSibling()));
if (!f)
break;
result = f;
@ -2763,7 +2763,7 @@ nsLayoutUtils::IsFirstContinuationOrIBSplitSibling(nsIFrame *aFrame)
return false;
}
if ((aFrame->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT) &&
aFrame->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling())) {
aFrame->Properties().Get(nsIFrame::IBSplitPrevSibling())) {
return false;
}

14
layout/generic/nsFrame.cpp
View File

@ -625,7 +625,7 @@ nsFrame::DestroyFrom(nsIFrame* aDestructRoot)
if (mState & NS_FRAME_PART_OF_IBSPLIT) {
// Delete previous sibling's reference to me.
nsIFrame* prevSib = static_cast<nsIFrame*>
(Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
(Properties().Get(nsIFrame::IBSplitPrevSibling()));
if (prevSib) {
NS_WARN_IF_FALSE(this ==
prevSib->Properties().Get(nsIFrame::IBSplitSibling()),
@ -638,9 +638,9 @@ nsFrame::DestroyFrom(nsIFrame* aDestructRoot)
(Properties().Get(nsIFrame::IBSplitSibling()));
if (nextSib) {
NS_WARN_IF_FALSE(this ==
nextSib->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()),
nextSib->Properties().Get(nsIFrame::IBSplitPrevSibling()),
"IB sibling chain is inconsistent");
nextSib->Properties().Delete(nsIFrame::IBSplitSpecialPrevSibling());
nextSib->Properties().Delete(nsIFrame::IBSplitPrevSibling());
}
}
@ -5331,9 +5331,9 @@ nsIFrame::ListGeneric(nsACString& aTo, const char* aPrefix, uint32_t aFlags) con
if (IBsibling) {
aTo += nsPrintfCString(" IBSplitSibling=%p", IBsibling);
}
void* IBprevsibling = Properties().Get(IBSplitSpecialPrevSibling());
void* IBprevsibling = Properties().Get(IBSplitPrevSibling());
if (IBprevsibling) {
aTo += nsPrintfCString(" IBSplitSpecialPrevSibling=%p", IBprevsibling);
aTo += nsPrintfCString(" IBSplitPrevSibling=%p", IBprevsibling);
}
aTo += nsPrintfCString(" {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
nsIFrame* f = const_cast<nsIFrame*>(this);
@ -7188,11 +7188,11 @@ GetIBSplitSiblingForAnonymousBlock(const nsIFrame* aFrame)
aFrame = aFrame->FirstContinuation();
/*
* Now look up the nsGkAtoms::IBSplitSpecialPrevSibling
* Now look up the nsGkAtoms::IBSplitPrevSibling
* property.
*/
nsIFrame *specialSibling = static_cast<nsIFrame*>
(aFrame->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling()));
(aFrame->Properties().Get(nsIFrame::IBSplitPrevSibling()));
NS_ASSERTION(specialSibling, "Broken frame tree?");
return specialSibling;
}

4
layout/generic/nsIFrame.h
View File

@ -780,7 +780,7 @@ public:
}
NS_DECLARE_FRAME_PROPERTY(IBSplitSibling, nullptr)
NS_DECLARE_FRAME_PROPERTY(IBSplitSpecialPrevSibling, nullptr)
NS_DECLARE_FRAME_PROPERTY(IBSplitPrevSibling, nullptr)
NS_DECLARE_FRAME_PROPERTY(NormalPositionProperty, DestroyPoint)
NS_DECLARE_FRAME_PROPERTY(ComputedOffsetProperty, DestroyMargin)
@ -2809,7 +2809,7 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::ParagraphDepthProperty()))
*/
bool FrameIsNonFirstInIBSplit() const {
return (GetStateBits() & NS_FRAME_PART_OF_IBSPLIT) &&
FirstContinuation()->Properties().Get(nsIFrame::IBSplitSpecialPrevSibling());
FirstContinuation()->Properties().Get(nsIFrame::IBSplitPrevSibling());
}
/**

2
layout/generic/nsPlaceholderFrame.cpp
View File

@ -122,7 +122,7 @@ nsPlaceholderFrame::Reflow(nsPresContext* aPresContext,
nsIFrame* ancestor = this;
while ((ancestor = ancestor->GetParent())) {
if (ancestor->GetPrevContinuation() ||
ancestor->Properties().Get(IBSplitSpecialPrevSibling())) {
ancestor->Properties().Get(IBSplitPrevSibling())) {
isInContinuationOrIBSplit = true;
break;
}