Bug 957835 - Move operator|(FrameChildListID, FrameChildListID) to mozilla::layout. r=mats
authorBotond Ballo <botond@mozilla.com>
Thu, 02 Jan 2014 16:28:19 -0500
changeset 163398 c70ef7e9f515fd7e74ddec1687db9d6ab708b6e5
parent 163397 5a92a2731aa29a6a16ac6c3a7eaf2559d569fb2e
child 163399 65063b84c63a72da0cf14689c4fb2a492f4f62ad
push id38465
push userkwierso@gmail.com
push dateWed, 15 Jan 2014 00:14:00 +0000
treeherdermozilla-inbound@43832758b909 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs957835
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 957835 - Move operator|(FrameChildListID, FrameChildListID) to mozilla::layout. r=mats
layout/generic/FrameChildList.h
--- a/layout/generic/FrameChildList.h
+++ b/layout/generic/FrameChildList.h
@@ -91,34 +91,34 @@ class MOZ_STACK_CLASS FrameChildListIter
   : public FrameChildListArrayIterator {
  public:
   FrameChildListIterator(const nsIFrame* aFrame);
 
 protected:
   nsAutoTArray<FrameChildList,4> mLists;
 };
 
-} // namespace layout
-} // namespace mozilla
-
 inline mozilla::layout::FrameChildListIDs
 operator|(mozilla::layout::FrameChildListID aLeftOp,
           mozilla::layout::FrameChildListID aRightOp)
 {
   return mozilla::layout::FrameChildListIDs(aLeftOp) |
          mozilla::layout::FrameChildListIDs(aRightOp);
 }
 
 inline mozilla::layout::FrameChildListIDs
 operator|(mozilla::layout::FrameChildListID aLeftOp,
           mozilla::layout::FrameChildListIDs aRightOp)
 {
   return mozilla::layout::FrameChildListIDs(aLeftOp) | aRightOp;
 }
 
+} // namespace layout
+} // namespace mozilla
+
 inline void nsFrameList::AppendIfNonempty(
          nsTArray<mozilla::layout::FrameChildList>* aLists,
          mozilla::layout::FrameChildListID aListID) const
 {
   if (NotEmpty()) {
     aLists->AppendElement(mozilla::layout::FrameChildList(*this, aListID));
   }
 }