diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 8b5b4897ffca..d8986b482752 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -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; } diff --git a/layout/xul/nsBox.h b/layout/xul/nsBox.h index 163e95b63214..5598d4b376ac 100644 --- a/layout/xul/nsBox.h +++ b/layout/xul/nsBox.h @@ -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; diff --git a/layout/xul/nsBoxFrame.h b/layout/xul/nsBoxFrame.h index 121c753e76bd..2472b831d03a 100644 --- a/layout/xul/nsBoxFrame.h +++ b/layout/xul/nsBoxFrame.h @@ -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; } diff --git a/layout/xul/nsSprocketLayout.cpp b/layout/xul/nsSprocketLayout.cpp index fb5989aca53b..e33f70ba627f 100644 --- a/layout/xul/nsSprocketLayout.cpp +++ b/layout/xul/nsSprocketLayout.cpp @@ -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);