Implement new frame methods and store the current state

layout/base/src/nsFrame.cpp

@@ -927,6 +927,38 @@ NS_METHOD nsFrame::GetCursorAt(nsIPresContext& aPresContext,
 }
 
 // Resize and incremental reflow
+NS_METHOD
+nsFrame::GetFrameState(nsFrameState& aResult)
+{
+  aResult = mState;
+  return NS_OK;
+}
+
+NS_METHOD
+nsFrame::SetFrameState(nsFrameState aNewState)
+{
+  mState = aNewState;
+  return NS_OK;
+}
+
+// Resize reflow methods
+
+NS_METHOD
+nsFrame::WillReflow(nsIPresContext& aPresContext)
+{
+  mState |= NS_FRAME_IN_REFLOW;
+  return NS_OK;
+}
+
+NS_METHOD
+nsFrame::DidReflow(nsIPresContext& aPresContext,
+                   nsDidReflowStatus aStatus)
+{
+  if (NS_FRAME_REFLOW_FINISHED == aStatus) {
+    mState &= ~NS_FRAME_IN_REFLOW;
+  }
+  return NS_OK;
+}
 
 NS_METHOD nsFrame::ResizeReflow(nsIPresContext*  aPresContext,
                                 nsReflowMetrics& aDesiredSize,

layout/base/src/nsFrame.h

@@ -80,33 +80,33 @@ public:
   NS_IMETHOD  Paint(nsIPresContext&      aPresContext,
                     nsIRenderingContext& aRenderingContext,
                     const nsRect&        aDirtyRect);
-
   NS_IMETHOD  HandleEvent(nsIPresContext& aPresContext, 
                           nsGUIEvent*     aEvent,
                           nsEventStatus&  aEventStatus);
-
   NS_IMETHOD  GetCursorAt(nsIPresContext& aPresContext,
                           const nsPoint&  aPoint,
                           nsIFrame**      aFrame,
                           PRInt32&        aCursor);
 
+  NS_IMETHOD  GetFrameState(nsFrameState& aResult);
+  NS_IMETHOD  SetFrameState(nsFrameState aNewState);
+
   // Resize reflow methods
+  NS_IMETHOD  WillReflow(nsIPresContext& aPresContext);
+  NS_IMETHOD  DidReflow(nsIPresContext& aPresContext,
+                        nsDidReflowStatus aStatus);
   NS_IMETHOD  ResizeReflow(nsIPresContext*  aPresContext,
                            nsReflowMetrics& aDesiredSize,
                            const nsSize&    aMaxSize,
                            nsSize*          aMaxElementSize,
                            nsReflowStatus&  aStatus);
-
   NS_IMETHOD  JustifyReflow(nsIPresContext* aPresContext,
                             nscoord         aAvailableSpace);
-
-  // Incremental reflow methods
   NS_IMETHOD  IncrementalReflow(nsIPresContext*  aPresContext,
                                 nsReflowMetrics& aDesiredSize,
                                 const nsSize&    aMaxSize,
                                 nsReflowCommand& aReflowCommand,
                                 nsReflowStatus&  aStatus);
-
   NS_IMETHOD  ContentAppended(nsIPresShell*   aShell,
                               nsIPresContext* aPresContext,
                               nsIContent*     aContainer);
@@ -130,7 +130,6 @@ public:
                              nsIPresContext* aPresContext,
                              nsIContent*     aChild,
                              nsISupports*    aSubContent);
-
   NS_IMETHOD  GetReflowMetrics(nsIPresContext*  aPresContext,
                                nsReflowMetrics& aMetrics);
 
@@ -238,6 +237,7 @@ protected:
   nsIFrame*        mContentParent;
   nsIFrame*        mGeometricParent;
   nsIFrame*        mNextSibling;  // singly linked list of frames
+  nsFrameState     mState;
 
   ///////////////////////////////////
   // Important Selection Variables