Bug 957835 - Move operator|(FrameChildListID, FrameChildListID) to mozilla::layout. r=mats

--HG--
extra : rebase_source : 25fe8f29a6c826a5181e18880c393df9930f9d5c
This commit is contained in:
Botond Ballo 2014-01-02 16:28:19 -05:00
parent 835dd20b9c
commit 361555f141

View File

@ -96,9 +96,6 @@ protected:
nsAutoTArray<FrameChildList,4> mLists;
};
} // namespace layout
} // namespace mozilla
inline mozilla::layout::FrameChildListIDs
operator|(mozilla::layout::FrameChildListID aLeftOp,
mozilla::layout::FrameChildListID aRightOp)
@ -114,6 +111,9 @@ operator|(mozilla::layout::FrameChildListID aLeftOp,
return mozilla::layout::FrameChildListIDs(aLeftOp) | aRightOp;
}
} // namespace layout
} // namespace mozilla
inline void nsFrameList::AppendIfNonempty(
nsTArray<mozilla::layout::FrameChildList>* aLists,
mozilla::layout::FrameChildListID aListID) const