зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1053986 - Rename nsIFrame::GetHAlign to GetXULHAlign. r=dholbert
Written purely with sed, over .h and .cpp files in layout/. MozReview-Commit-ID: FW1DjQ2uCnk
This commit is contained in:
Родитель
09ce96ec3a
Коммит
318d797bb2
|
@ -2922,7 +2922,7 @@ public:
|
|||
|
||||
// For nsSprocketLayout
|
||||
virtual Valignment GetXULVAlign() const = 0;
|
||||
virtual Halignment GetHAlign() const = 0;
|
||||
virtual Halignment GetXULHAlign() const = 0;
|
||||
|
||||
bool IsHorizontal() const { return (mState & NS_STATE_IS_HORIZONTAL) != 0; }
|
||||
bool IsNormalDirection() const { return (mState & NS_STATE_IS_DIRECTION_NORMAL) != 0; }
|
||||
|
|
|
@ -37,7 +37,7 @@ public:
|
|||
virtual nsresult GetXULMargin(nsMargin& aMargin) override;
|
||||
|
||||
virtual Valignment GetXULVAlign() const override { return vAlign_Top; }
|
||||
virtual Halignment GetHAlign() const override { return hAlign_Left; }
|
||||
virtual Halignment GetXULHAlign() const override { return hAlign_Left; }
|
||||
|
||||
virtual nsresult RelayoutChildAtOrdinal(nsIFrame* aChild) override;
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ public:
|
|||
virtual nsresult GetDebug(bool& aDebug) override;
|
||||
#endif
|
||||
virtual Valignment GetXULVAlign() const override { return mValign; }
|
||||
virtual Halignment GetHAlign() const override { return mHalign; }
|
||||
virtual Halignment GetXULHAlign() const override { return mHalign; }
|
||||
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) override;
|
||||
|
||||
virtual bool ComputesOwnOverflowArea() override { return false; }
|
||||
|
|
|
@ -114,7 +114,7 @@ HandleBoxPack(nsIFrame* aBox, const nsFrameState& aFrameState, nscoord& aX, nsco
|
|||
}
|
||||
|
||||
// Get our pack/alignment information.
|
||||
nsIFrame::Halignment halign = aBox->GetHAlign();
|
||||
nsIFrame::Halignment halign = aBox->GetXULHAlign();
|
||||
nsIFrame::Valignment valign = aBox->GetXULVAlign();
|
||||
|
||||
// The following code handles box PACKING. Packing comes into play in the case where the computed size for
|
||||
|
@ -942,7 +942,7 @@ nsSprocketLayout::AlignChildren(nsIFrame* aBox,
|
|||
}
|
||||
} else {
|
||||
isLTR = GetFrameDirection(aBox) == NS_STYLE_DIRECTION_LTR;
|
||||
halign = aBox->GetHAlign();
|
||||
halign = aBox->GetXULHAlign();
|
||||
}
|
||||
|
||||
nsIFrame* child = nsBox::GetChildXULBox(aBox);
|
||||
|
|
Загрузка…
Ссылка в новой задаче