mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 1053986 - Rename nsIFrame::GetOrdinal to GetXULOrdinal. r=dholbert
This is a manual subset of changes written with sed, over .h and .cpp files in layout/. MozReview-Commit-ID: Cj9yHRCuqzx
This commit is contained in:
parent
72e04ee41a
commit
81bae7f235
@ -2896,7 +2896,7 @@ public:
|
||||
virtual nsSize GetXULMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState) = 0;
|
||||
|
||||
// Implemented in nsBox, used in nsBoxFrame
|
||||
uint32_t GetOrdinal();
|
||||
uint32_t GetXULOrdinal();
|
||||
|
||||
virtual nscoord GetFlex() = 0;
|
||||
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) = 0;
|
||||
|
@ -462,7 +462,7 @@ nsBox::GetFlex()
|
||||
}
|
||||
|
||||
uint32_t
|
||||
nsIFrame::GetOrdinal()
|
||||
nsIFrame::GetXULOrdinal()
|
||||
{
|
||||
uint32_t ordinal = StyleXUL()->mBoxOrdinal;
|
||||
|
||||
|
@ -1907,7 +1907,7 @@ IsBoxOrdinalLEQ(nsIFrame* aFrame1,
|
||||
// If we've got a placeholder frame, use its out-of-flow frame's ordinal val.
|
||||
nsIFrame* aRealFrame1 = nsPlaceholderFrame::GetRealFrameFor(aFrame1);
|
||||
nsIFrame* aRealFrame2 = nsPlaceholderFrame::GetRealFrameFor(aFrame2);
|
||||
return aRealFrame1->GetOrdinal() <= aRealFrame2->GetOrdinal();
|
||||
return aRealFrame1->GetXULOrdinal() <= aRealFrame2->GetXULOrdinal();
|
||||
}
|
||||
|
||||
void
|
||||
@ -1941,13 +1941,13 @@ nsBoxFrame::RelayoutChildAtOrdinal(nsIFrame* aChild)
|
||||
if (!SupportsOrdinalsInChildren())
|
||||
return NS_OK;
|
||||
|
||||
uint32_t ord = aChild->GetOrdinal();
|
||||
uint32_t ord = aChild->GetXULOrdinal();
|
||||
|
||||
nsIFrame* child = mFrames.FirstChild();
|
||||
nsIFrame* newPrevSib = nullptr;
|
||||
|
||||
while (child) {
|
||||
if (ord < child->GetOrdinal()) {
|
||||
if (ord < child->GetXULOrdinal()) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user