Bug 557174. Don't lose the rest of our frames just because we found a popup. r=roc, a=LegNeato
authorBoris Zbarsky <bzbarsky@mit.edu>
Wed, 28 Apr 2010 20:40:28 -0500
changeset 26905 8cf59c16b1d51c080407510800e6fbb47d9b7266
parent 26904 698315fde952ee3fafa27e3067f6122c36648c72
child 26906 e28579a435853df583d496f8097b3729d63edd68
push id2363
push userreed@reedloden.com
push dateThu, 29 Apr 2010 01:42:39 +0000
reviewersroc, LegNeato
bugs557174
milestone1.9.1.10pre
Bug 557174. Don't lose the rest of our frames just because we found a popup. r=roc, a=LegNeato
layout/xul/base/src/nsMenuFrame.cpp
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -1223,18 +1223,16 @@ nsMenuFrame::InsertFrames(nsIAtom*      
 #ifdef DEBUG_LAYOUT
       nsBoxLayoutState state(PresContext());
       SetDebug(state, aFrameList, mState & NS_STATE_CURRENTLY_IN_DEBUG);
 #endif
 
       PresContext()->PresShell()->
         FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                          NS_FRAME_HAS_DIRTY_CHILDREN);
-
-      return NS_OK;
     }
   }
 
   if (!aFrameList)
     return NS_OK;
 
   if (NS_UNLIKELY(aPrevFrame == mPopupFrame)) {
     aPrevFrame = nsnull;
@@ -1256,18 +1254,16 @@ nsMenuFrame::AppendFrames(nsIAtom*      
 
 #ifdef DEBUG_LAYOUT
       nsBoxLayoutState state(PresContext());
       SetDebug(state, aFrameList, mState & NS_STATE_CURRENTLY_IN_DEBUG);
 #endif
       PresContext()->PresShell()->
         FrameNeedsReflow(this, nsIPresShell::eTreeChange,
                          NS_FRAME_HAS_DIRTY_CHILDREN);
-
-      return NS_OK;
     }
   }
 
   if (!aFrameList)
     return NS_OK;
 
   return nsBoxFrame::AppendFrames(aListName, aFrameList); 
 }