зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1053986 - Rename nsIFrame::RelayoutChildAtOrdinal to XULRelayoutChildAtOrdinal. r=dholbert
Written purely with sed, over .h and .cpp files in layout/. MozReview-Commit-ID: 6nN7dzGoCpX
This commit is contained in:
Родитель
9b694e75bf
Коммит
724e8f5649
|
@ -2928,7 +2928,7 @@ public:
|
|||
bool IsXULNormalDirection() const { return (mState & NS_STATE_IS_DIRECTION_NORMAL) != 0; }
|
||||
|
||||
nsresult XULRedraw(nsBoxLayoutState& aState);
|
||||
virtual nsresult RelayoutChildAtOrdinal(nsIFrame* aChild)=0;
|
||||
virtual nsresult XULRelayoutChildAtOrdinal(nsIFrame* aChild)=0;
|
||||
|
||||
#ifdef DEBUG_LAYOUT
|
||||
virtual nsresult SetDebug(nsBoxLayoutState& aState, bool aDebug)=0;
|
||||
|
|
|
@ -202,7 +202,7 @@ nsBox::Shutdown()
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsBox::RelayoutChildAtOrdinal(nsIFrame* aChild)
|
||||
nsBox::XULRelayoutChildAtOrdinal(nsIFrame* aChild)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ public:
|
|||
virtual Valignment GetXULVAlign() const override { return vAlign_Top; }
|
||||
virtual Halignment GetXULHAlign() const override { return hAlign_Left; }
|
||||
|
||||
virtual nsresult RelayoutChildAtOrdinal(nsIFrame* aChild) override;
|
||||
virtual nsresult XULRelayoutChildAtOrdinal(nsIFrame* aChild) override;
|
||||
|
||||
#ifdef DEBUG_LAYOUT
|
||||
NS_IMETHOD GetDebugBoxAt(const nsPoint& aPoint, nsIFrame** aBox);
|
||||
|
|
|
@ -1232,11 +1232,11 @@ nsBoxFrame::AttributeChanged(int32_t aNameSpaceID,
|
|||
// If our parent is not a box, there's not much we can do... but in that
|
||||
// case our ordinal doesn't matter anyway, so that's ok.
|
||||
// Also don't bother with popup frames since they are kept on the
|
||||
// kPopupList and RelayoutChildAtOrdinal() only handles
|
||||
// kPopupList and XULRelayoutChildAtOrdinal() only handles
|
||||
// principal children.
|
||||
if (parent && !(GetStateBits() & NS_FRAME_OUT_OF_FLOW) &&
|
||||
StyleDisplay()->mDisplay != NS_STYLE_DISPLAY_POPUP) {
|
||||
parent->RelayoutChildAtOrdinal(this);
|
||||
parent->XULRelayoutChildAtOrdinal(this);
|
||||
// XXXldb Should this instead be a tree change on the child or parent?
|
||||
PresContext()->PresShell()->
|
||||
FrameNeedsReflow(parent, nsIPresShell::eStyleChange,
|
||||
|
@ -1936,7 +1936,7 @@ nsBoxFrame::LayoutChildAt(nsBoxLayoutState& aState, nsIFrame* aBox, const nsRect
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsBoxFrame::RelayoutChildAtOrdinal(nsIFrame* aChild)
|
||||
nsBoxFrame::XULRelayoutChildAtOrdinal(nsIFrame* aChild)
|
||||
{
|
||||
if (!SupportsOrdinalsInChildren())
|
||||
return NS_OK;
|
||||
|
|
|
@ -59,7 +59,7 @@ public:
|
|||
virtual void SetXULLayoutManager(nsBoxLayout* aLayout) override { mLayoutManager = aLayout; }
|
||||
virtual nsBoxLayout* GetXULLayoutManager() override { return mLayoutManager; }
|
||||
|
||||
virtual nsresult RelayoutChildAtOrdinal(nsIFrame* aChild) override;
|
||||
virtual nsresult XULRelayoutChildAtOrdinal(nsIFrame* aChild) override;
|
||||
|
||||
virtual nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
|
||||
virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
|
||||
|
|
Загрузка…
Ссылка в новой задаче