From 2a1c8d35942cdff349b8fa156615a8262fa885a1 Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com"
 <bryner%brianryner.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 22 Jun 2004 02:55:04 +0000
Subject: [PATCH] deCOMtaminate nsBoxLayoutState.  Bug 247766, r+sr=roc.

git-svn-id: svn://10.0.0.236/trunk@158283 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/forms/nsTextControlFrame.cpp   |  2 +-
 mozilla/layout/generic/nsGfxScrollFrame.cpp   | 38 ++++-----
 .../layout/html/base/src/nsGfxScrollFrame.cpp | 38 ++++-----
 .../html/forms/src/nsTextControlFrame.cpp     |  2 +-
 mozilla/layout/xul/base/src/nsBox.cpp         | 56 +++++--------
 mozilla/layout/xul/base/src/nsBoxFrame.cpp    |  4 +-
 .../layout/xul/base/src/nsBoxLayoutState.cpp  | 79 +------------------
 .../layout/xul/base/src/nsBoxLayoutState.h    | 62 ++++++++-------
 .../xul/base/src/nsBoxToBlockAdaptor.cpp      | 13 ++-
 .../layout/xul/base/src/nsContainerBox.cpp    | 16 ++--
 mozilla/layout/xul/base/src/nsDeckFrame.cpp   |  9 +--
 .../xul/base/src/nsListBoxBodyFrame.cpp       | 12 +--
 .../layout/xul/base/src/nsListBoxLayout.cpp   |  2 +-
 mozilla/layout/xul/base/src/nsMenuFrame.cpp   |  4 +-
 .../layout/xul/base/src/nsMenuPopupFrame.cpp  |  8 +-
 .../xul/base/src/nsNativeScrollbarFrame.cpp   |  2 +-
 .../layout/xul/base/src/nsPopupSetFrame.cpp   |  4 +-
 .../layout/xul/base/src/nsScrollBoxFrame.cpp  |  8 +-
 mozilla/layout/xul/base/src/nsSliderFrame.cpp |  2 +-
 .../layout/xul/base/src/nsSprocketLayout.cpp  |  4 +-
 mozilla/layout/xul/base/src/nsStackLayout.cpp |  2 +-
 .../layout/xul/base/src/nsTextBoxFrame.cpp    |  2 +-
 22 files changed, 131 insertions(+), 238 deletions(-)

diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp
index f6e4c1b9c8e..cc6e9b4e4ca 100644
--- a/mozilla/layout/forms/nsTextControlFrame.cpp
+++ b/mozilla/layout/forms/nsTextControlFrame.cpp
@@ -1985,7 +1985,7 @@ nsTextControlFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
   if (collapsed)
     return NS_OK;
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   const nsHTMLReflowState* reflowState = aState.GetReflowState();
   nsSize styleSize(CSS_NOTSET,CSS_NOTSET);
   nsFormControlFrame::GetStyleSize(presContext, *reflowState, styleSize);
diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp
index c9db6d0cca9..aa15d914b19 100644
--- a/mozilla/layout/generic/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp
@@ -392,8 +392,7 @@ nsHTMLScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
   // should not affect sizing...
 
   // Push current constraint. We'll restore it when we're done.
-  nsSize oldConstrainedSize;
-  aState.GetScrolledBlockSizeConstraint(oldConstrainedSize);
+  nsSize oldConstrainedSize = aState.ScrolledBlockSizeConstraint();
 
   const nsHTMLReflowState* HTMLState = aState.GetReflowState();
   // This stores the computed width and height, if available.
@@ -588,13 +587,12 @@ nsHTMLScrollFrame::CurPosAttributeChanged(nsIPresContext* aPresContext,
 NS_IMETHODIMP
 nsHTMLScrollFrame::DoLayout(nsBoxLayoutState& aState)
 {
-   PRUint32 flags = 0;
-   aState.GetLayoutFlags(flags);
-   nsresult rv =  mInner.Layout(aState);
-   aState.SetLayoutFlags(flags);
+  PRUint32 flags = aState.LayoutFlags();
+  nsresult rv = mInner.Layout(aState);
+  aState.SetLayoutFlags(flags);
 
-   nsBox::DoLayout(aState);
-   return rv;
+  nsBox::DoLayout(aState);
+  return rv;
 }
 
 
@@ -936,8 +934,7 @@ nsXULScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
   // should not affect sizing...
 
   // Push current constraint. We'll restore it when we're done.
-  nsSize oldConstrainedSize;
-  aState.GetScrolledBlockSizeConstraint(oldConstrainedSize);
+  nsSize oldConstrainedSize = aState.ScrolledBlockSizeConstraint();
 
   const nsHTMLReflowState* HTMLState = aState.GetReflowState();
   // This stores the computed width and height, if available.
@@ -1132,13 +1129,12 @@ nsXULScrollFrame::CurPosAttributeChanged(nsIPresContext* aPresContext,
 NS_IMETHODIMP
 nsXULScrollFrame::DoLayout(nsBoxLayoutState& aState)
 {
-   PRUint32 flags = 0;
-   aState.GetLayoutFlags(flags);
-   nsresult rv =  mInner.Layout(aState);
-   aState.SetLayoutFlags(flags);
+  PRUint32 flags = aState.LayoutFlags();
+  nsresult rv = mInner.Layout(aState);
+  aState.SetLayoutFlags(flags);
 
-   nsBox::DoLayout(aState);
-   return rv;
+  nsBox::DoLayout(aState);
+  return rv;
 }
 
 
@@ -1843,7 +1839,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
   // if we have 'auto' scrollbars look at the vertical case
   if (styles.mVertical != NS_STYLE_OVERFLOW_SCROLL) {
       // get the area frame is the scrollarea
-      GetScrolledSize(aState.GetPresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
+      GetScrolledSize(aState.PresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
 
     // There are two cases to consider
       if (scrolledContentSize.height <= scrollAreaRect.height
@@ -1881,7 +1877,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
   if (styles.mHorizontal != NS_STYLE_OVERFLOW_SCROLL)
   {
     // get the area frame is the scrollarea
-      GetScrolledSize(aState.GetPresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
+      GetScrolledSize(aState.PresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
 
     // if the child is wider that the scroll area
     // and we don't have a scrollbar add one.
@@ -1939,9 +1935,9 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
 #endif // IBMBIDI
   }
     
-  GetScrolledSize(aState.GetPresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
+  GetScrolledSize(aState.PresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   float p2t;
   presContext->GetScaledPixelsToTwips(&p2t);
   mOnePixel = NSIntPixelsToTwips(1, p2t);
@@ -2076,7 +2072,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
   // be re-laid out anyway)
   if ((oldScrollAreaBounds.width != scrollAreaRect.width
       || oldScrollAreaBounds.height != scrollAreaRect.height)
-      && nsBoxLayoutState::Dirty == aState.GetLayoutReason()) {
+      && nsBoxLayoutState::Dirty == aState.LayoutReason()) {
     nsIFrame* parentFrame = mOuter->GetParent();
     if (parentFrame) {
       if (parentFrame->GetType() == nsLayoutAtoms::viewportFrame) {
diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
index c9db6d0cca9..aa15d914b19 100644
--- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp
@@ -392,8 +392,7 @@ nsHTMLScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
   // should not affect sizing...
 
   // Push current constraint. We'll restore it when we're done.
-  nsSize oldConstrainedSize;
-  aState.GetScrolledBlockSizeConstraint(oldConstrainedSize);
+  nsSize oldConstrainedSize = aState.ScrolledBlockSizeConstraint();
 
   const nsHTMLReflowState* HTMLState = aState.GetReflowState();
   // This stores the computed width and height, if available.
@@ -588,13 +587,12 @@ nsHTMLScrollFrame::CurPosAttributeChanged(nsIPresContext* aPresContext,
 NS_IMETHODIMP
 nsHTMLScrollFrame::DoLayout(nsBoxLayoutState& aState)
 {
-   PRUint32 flags = 0;
-   aState.GetLayoutFlags(flags);
-   nsresult rv =  mInner.Layout(aState);
-   aState.SetLayoutFlags(flags);
+  PRUint32 flags = aState.LayoutFlags();
+  nsresult rv = mInner.Layout(aState);
+  aState.SetLayoutFlags(flags);
 
-   nsBox::DoLayout(aState);
-   return rv;
+  nsBox::DoLayout(aState);
+  return rv;
 }
 
 
@@ -936,8 +934,7 @@ nsXULScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
   // should not affect sizing...
 
   // Push current constraint. We'll restore it when we're done.
-  nsSize oldConstrainedSize;
-  aState.GetScrolledBlockSizeConstraint(oldConstrainedSize);
+  nsSize oldConstrainedSize = aState.ScrolledBlockSizeConstraint();
 
   const nsHTMLReflowState* HTMLState = aState.GetReflowState();
   // This stores the computed width and height, if available.
@@ -1132,13 +1129,12 @@ nsXULScrollFrame::CurPosAttributeChanged(nsIPresContext* aPresContext,
 NS_IMETHODIMP
 nsXULScrollFrame::DoLayout(nsBoxLayoutState& aState)
 {
-   PRUint32 flags = 0;
-   aState.GetLayoutFlags(flags);
-   nsresult rv =  mInner.Layout(aState);
-   aState.SetLayoutFlags(flags);
+  PRUint32 flags = aState.LayoutFlags();
+  nsresult rv = mInner.Layout(aState);
+  aState.SetLayoutFlags(flags);
 
-   nsBox::DoLayout(aState);
-   return rv;
+  nsBox::DoLayout(aState);
+  return rv;
 }
 
 
@@ -1843,7 +1839,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
   // if we have 'auto' scrollbars look at the vertical case
   if (styles.mVertical != NS_STYLE_OVERFLOW_SCROLL) {
       // get the area frame is the scrollarea
-      GetScrolledSize(aState.GetPresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
+      GetScrolledSize(aState.PresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
 
     // There are two cases to consider
       if (scrolledContentSize.height <= scrollAreaRect.height
@@ -1881,7 +1877,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
   if (styles.mHorizontal != NS_STYLE_OVERFLOW_SCROLL)
   {
     // get the area frame is the scrollarea
-      GetScrolledSize(aState.GetPresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
+      GetScrolledSize(aState.PresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
 
     // if the child is wider that the scroll area
     // and we don't have a scrollbar add one.
@@ -1939,9 +1935,9 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
 #endif // IBMBIDI
   }
     
-  GetScrolledSize(aState.GetPresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
+  GetScrolledSize(aState.PresContext(),&scrolledContentSize.width, &scrolledContentSize.height);
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   float p2t;
   presContext->GetScaledPixelsToTwips(&p2t);
   mOnePixel = NSIntPixelsToTwips(1, p2t);
@@ -2076,7 +2072,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
   // be re-laid out anyway)
   if ((oldScrollAreaBounds.width != scrollAreaRect.width
       || oldScrollAreaBounds.height != scrollAreaRect.height)
-      && nsBoxLayoutState::Dirty == aState.GetLayoutReason()) {
+      && nsBoxLayoutState::Dirty == aState.LayoutReason()) {
     nsIFrame* parentFrame = mOuter->GetParent();
     if (parentFrame) {
       if (parentFrame->GetType() == nsLayoutAtoms::viewportFrame) {
diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
index f6e4c1b9c8e..cc6e9b4e4ca 100644
--- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
@@ -1985,7 +1985,7 @@ nsTextControlFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
   if (collapsed)
     return NS_OK;
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   const nsHTMLReflowState* reflowState = aState.GetReflowState();
   nsSize styleSize(CSS_NOTSET,CSS_NOTSET);
   nsFormControlFrame::GetStyleSize(presContext, *reflowState, styleSize);
diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp
index 214ceb914b9..025ea04cdf1 100644
--- a/mozilla/layout/xul/base/src/nsBox.cpp
+++ b/mozilla/layout/xul/base/src/nsBox.cpp
@@ -164,7 +164,7 @@ nsBox::BeginLayout(nsBoxLayoutState& aState)
       nsBoxAddIndents();
 
       nsAutoString reason;
-      switch(aState.GetLayoutReason())
+      switch(aState.LayoutReason())
       {
         case nsBoxLayoutState::Dirty:
            reason.AssignLiteral("Dirty");
@@ -306,9 +306,7 @@ nsBox::MarkDirty(nsBoxLayoutState& aState)
   if (parent)
      return parent->RelayoutDirtyChild(aState, this);
   else {
-    nsCOMPtr<nsIPresShell> shell;
-    aState.GetPresShell(getter_AddRefs(shell));
-    return frame->GetParent()->ReflowDirtyChild(shell, frame);
+    return frame->GetParent()->ReflowDirtyChild(aState.PresShell(), frame);
   }
 }
 
@@ -340,19 +338,15 @@ nsBox::MarkStyleChange(nsBoxLayoutState& aState)
      return parent->RelayoutDirtyChild(aState, this);
   else {
     /*
-    nsCOMPtr<nsIPresShell> shell;
-    aState.GetPresShell(getter_AddRefs(shell));
     nsIFrame* frame = nsnull;
     GetFrame(&frame);
-    nsFrame::CreateAndPostReflowCommand(shell, frame, 
+    nsFrame::CreateAndPostReflowCommand(aState.PresShell(), frame, 
       nsHTMLReflowCommand::StyleChange, nsnull, nsnull, nsnull);
     return NS_OK;
     */
     nsIFrame* frame = nsnull;
     GetFrame(&frame);
-    nsCOMPtr<nsIPresShell> shell;
-    aState.GetPresShell(getter_AddRefs(shell));
-    return frame->GetParent()->ReflowDirtyChild(shell, frame);
+    return frame->GetParent()->ReflowDirtyChild(aState.PresShell(), frame);
   }
 
   return NS_OK;
@@ -424,11 +418,9 @@ nsBox::RelayoutStyleChange(nsBoxLayoutState& aState, nsIBox* aChild)
       if (parent)
          return parent->RelayoutStyleChange(aState, this);
       else {
-        nsCOMPtr<nsIPresShell> shell;
-        aState.GetPresShell(getter_AddRefs(shell));
         nsIFrame* frame = nsnull;
         aChild->GetFrame(&frame);
-        nsFrame::CreateAndPostReflowCommand(shell, frame, 
+        nsFrame::CreateAndPostReflowCommand(aState.PresShell(), frame, 
           eReflowType_StyleChanged, nsnull, nsnull, nsnull);
         return NS_OK;
       }
@@ -461,9 +453,7 @@ nsBox::RelayoutDirtyChild(nsBoxLayoutState& aState, nsIBox* aChild)
       frame->AddStateBits(NS_FRAME_HAS_DIRTY_CHILDREN);
 
       if (frame->GetStateBits() & NS_FRAME_REFLOW_ROOT) {
-        nsCOMPtr<nsIPresShell> shell;
-        aState.GetPresShell(getter_AddRefs(shell));
-        nsFrame::CreateAndPostReflowCommand(shell, frame, 
+        nsFrame::CreateAndPostReflowCommand(aState.PresShell(), frame, 
                                             eReflowType_ReflowDirty,
                                             nsnull, nsnull, nsnull);
         return NS_OK;
@@ -475,9 +465,7 @@ nsBox::RelayoutDirtyChild(nsBoxLayoutState& aState, nsIBox* aChild)
       GetParentBox(&parentBox);
       if (parentBox)
          return parentBox->RelayoutDirtyChild(aState, this);
-      nsCOMPtr<nsIPresShell> shell;
-      aState.GetPresShell(getter_AddRefs(shell));
-      return frame->GetParent()->ReflowDirtyChild(shell, frame);
+      return frame->GetParent()->ReflowDirtyChild(aState.PresShell(), frame);
     } else {
 #ifdef DEBUG_COELESCED
       Coelesced();
@@ -562,13 +550,12 @@ nsBox::SetBounds(nsBoxLayoutState& aState, const nsRect& aRect)
     nsIFrame* frame = nsnull;
     GetFrame(&frame);
 
-    nsIPresContext* presContext = aState.GetPresContext();
+    nsIPresContext* presContext = aState.PresContext();
 
     PRUint32 flags = 0;
     GetLayoutFlags(flags);
 
-    PRUint32 stateFlags = 0;
-    aState.GetLayoutFlags(stateFlags);
+    PRUint32 stateFlags = aState.LayoutFlags();
 
     flags |= stateFlags;
 
@@ -794,7 +781,7 @@ nsBox::Collapse(nsBoxLayoutState& aState)
 nsresult 
 nsBox::CollapseChild(nsBoxLayoutState& aState, nsIFrame* aFrame, PRBool aHide)
 {
-      nsIPresContext* presContext = aState.GetPresContext();
+      nsIPresContext* presContext = aState.PresContext();
 
     // shrink the view
       nsIView* view = aFrame->GetView();
@@ -1029,7 +1016,7 @@ nsBox::SyncLayout(nsBoxLayoutState& aState)
 
   PRBool dirty = PR_FALSE;
   IsDirty(dirty);
-  if (dirty || aState.GetLayoutReason() == nsBoxLayoutState::Initial)
+  if (dirty || aState.LayoutReason() == nsBoxLayoutState::Initial)
      Redraw(aState);
 
   nsIFrame* frame;
@@ -1037,15 +1024,14 @@ nsBox::SyncLayout(nsBoxLayoutState& aState)
   frame->RemoveStateBits(NS_FRAME_HAS_DIRTY_CHILDREN | NS_FRAME_IS_DIRTY
                          | NS_FRAME_FIRST_REFLOW | NS_FRAME_IN_REFLOW);
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   nsRect rect(0,0,0,0);
   GetBounds(rect);
 
   PRUint32 flags = 0;
   GetLayoutFlags(flags);
 
-  PRUint32 stateFlags = 0;
-  aState.GetLayoutFlags(stateFlags);
+  PRUint32 stateFlags = aState.LayoutFlags();
 
   flags |= stateFlags;
 
@@ -1083,10 +1069,10 @@ nsBox::Redraw(nsBoxLayoutState& aState,
               const nsRect*   aDamageRect,
               PRBool          aImmediate)
 {
-  if (aState.GetDisablePainting())
+  if (aState.PaintingDisabled())
     return NS_OK;
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   const nsHTMLReflowState* s = aState.GetReflowState();
   if (s) {
     if (s->reason != eReflowReason_Incremental)
@@ -1144,7 +1130,7 @@ nsIBox::AddCSSPrefSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
     // For example, we might be magic XUL frames whose primary content is an HTML
     // <select>
     if (content && content->IsContentOfType(nsIContent::eXUL)) {
-        nsIPresContext* presContext = aState.GetPresContext();
+        nsIPresContext* presContext = aState.PresContext();
 
         nsAutoString value;
         PRInt32 error;
@@ -1191,15 +1177,15 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
     const nsStyleDisplay* display = frame->GetStyleDisplay();
     if (display->mAppearance) {
       nsCOMPtr<nsITheme> theme;
-      aState.GetPresContext()->GetTheme(getter_AddRefs(theme));
-      if (theme && theme->ThemeSupportsWidget(aState.GetPresContext(), frame, display->mAppearance)) {
+      aState.PresContext()->GetTheme(getter_AddRefs(theme));
+      if (theme && theme->ThemeSupportsWidget(aState.PresContext(), frame, display->mAppearance)) {
         nsSize size;
         const nsHTMLReflowState* reflowState = aState.GetReflowState();
         if (reflowState) {
           theme->GetMinimumWidgetSize(reflowState->rendContext, frame, 
                                       display->mAppearance, &size, &canOverride);
           float p2t;
-          aState.GetPresContext()->GetScaledPixelsToTwips(&p2t);
+          aState.PresContext()->GetScaledPixelsToTwips(&p2t);
           if (size.width) {
             aSize.width = NSIntPixelsToTwips(size.width, p2t);
             widthSet = PR_TRUE;
@@ -1235,7 +1221,7 @@ nsIBox::AddCSSMinSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
 
     nsIContent* content = frame->GetContent();
     if (content) {
-        nsIPresContext* presContext = aState.GetPresContext();
+        nsIPresContext* presContext = aState.PresContext();
 
         nsAutoString value;
         PRInt32 error;
@@ -1299,7 +1285,7 @@ nsIBox::AddCSSMaxSize(nsBoxLayoutState& aState, nsIBox* aBox, nsSize& aSize)
 
     nsIContent* content = frame->GetContent();
     if (content) {
-        nsIPresContext* presContext = aState.GetPresContext();
+        nsIPresContext* presContext = aState.PresContext();
 
         nsAutoString value;
         PRInt32 error;
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
index 9ec99eca5b1..8b5a5e13466 100644
--- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
@@ -752,10 +752,10 @@ nsBoxFrame::IsInitialReflowForPrintPreview(nsBoxLayoutState& aState,
   const nsHTMLReflowState* reflowState = aState.GetReflowState();
   if (reflowState->reason == eReflowReason_Initial) {
     // See if we are doing Print Preview
-    nsCOMPtr<nsIPrintPreviewContext> ppContent(do_QueryInterface(aState.GetPresContext()));
+    nsCOMPtr<nsIPrintPreviewContext> ppContent(do_QueryInterface(aState.PresContext()));
     if (ppContent) {
       // Now, get the current URI to see if we doing chrome
-      nsIPresShell *presShell = aState.GetPresContext()->GetPresShell();
+      nsIPresShell *presShell = aState.PresShell();
       if (!presShell) return PR_FALSE;
       nsCOMPtr<nsIDocument> doc;
       presShell->GetDocument(getter_AddRefs(doc));
diff --git a/mozilla/layout/xul/base/src/nsBoxLayoutState.cpp b/mozilla/layout/xul/base/src/nsBoxLayoutState.cpp
index 949da1e7af7..f0804cb5ade 100644
--- a/mozilla/layout/xul/base/src/nsBoxLayoutState.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxLayoutState.cpp
@@ -55,9 +55,8 @@ nsBoxLayoutState::nsBoxLayoutState(nsIPresContext* aPresContext):mPresContext(aP
                                                                  mType(Dirty),
                                                                  mMaxElementWidth(nsnull),
                                                                  mScrolledBlockSizeConstraint(-1,-1),
-                                                                 mIncludeOverFlow(PR_TRUE),
                                                                  mLayoutFlags(0),
-                                                                 mDisablePainting(PR_FALSE)
+                                                                 mPaintingDisabled(PR_FALSE)
 {
   NS_ASSERTION(mPresContext, "PresContext must be non-null");
 }
@@ -70,7 +69,7 @@ nsBoxLayoutState::nsBoxLayoutState(const nsBoxLayoutState& aState)
   mMaxElementWidth = aState.mMaxElementWidth;
   mScrolledBlockSizeConstraint = aState.mScrolledBlockSizeConstraint;
   mLayoutFlags = aState.mLayoutFlags;
-  mDisablePainting = aState.mDisablePainting;
+  mPaintingDisabled = aState.mPaintingDisabled;
 
   NS_ASSERTION(mPresContext, "PresContext must be non-null");
 }
@@ -79,9 +78,8 @@ nsBoxLayoutState::nsBoxLayoutState(nsIPresShell* aShell):mReflowState(nsnull),
                                                          mType(Dirty),
                                                          mMaxElementWidth(nsnull),
                                                          mScrolledBlockSizeConstraint(-1,-1),
-                                                         mIncludeOverFlow(PR_TRUE),
                                                          mLayoutFlags(0),
-                                                         mDisablePainting(PR_FALSE)
+                                                         mPaintingDisabled(PR_FALSE)
 {
    aShell->GetPresContext(getter_AddRefs(mPresContext));
    NS_ASSERTION(mPresContext, "PresContext must be non-null");
@@ -93,9 +91,8 @@ nsBoxLayoutState::nsBoxLayoutState(nsIPresContext* aPresContext,
                                                                       mReflowState(&aReflowState),                                                                    
                                                                       mType(Dirty),
                                                                       mScrolledBlockSizeConstraint(-1,-1),
-                                                                      mIncludeOverFlow(PR_TRUE),
                                                                       mLayoutFlags(0),
-                                                                      mDisablePainting(PR_FALSE)
+                                                                      mPaintingDisabled(PR_FALSE)
 
                                                                                         
 
@@ -104,48 +101,6 @@ nsBoxLayoutState::nsBoxLayoutState(nsIPresContext* aPresContext,
   NS_ASSERTION(mPresContext, "PresContext must be non-null");
 }
 
-nscoord*
-nsBoxLayoutState::GetMaxElementWidth()
-{
-  return mReflowState ? mMaxElementWidth : nsnull;
-}
-
-void 
-nsBoxLayoutState::GetScrolledBlockSizeConstraint(nsSize& aSize)
-{
-  aSize = mScrolledBlockSizeConstraint;
-}
-
-void 
-nsBoxLayoutState::SetScrolledBlockSizeConstraint(const nsSize& aSize)
-{
-  mScrolledBlockSizeConstraint = aSize;
-}
-
-void 
-nsBoxLayoutState::GetIncludeOverFlow(PRBool& aOverflow)
-{
-  aOverflow = mIncludeOverFlow;
-}
-
-void 
-nsBoxLayoutState::SetLayoutFlags(const PRUint32& aFlags)
-{
-  mLayoutFlags = aFlags;
-}
-
-void 
-nsBoxLayoutState::GetLayoutFlags(PRUint32& aFlags)
-{
-  aFlags = mLayoutFlags;
-}
-
-void 
-nsBoxLayoutState::SetIncludeOverFlow(const PRBool& aOverflow)
-{
-  mIncludeOverFlow = aOverflow;
-}
-
 void
 nsBoxLayoutState::HandleReflow(nsIBox* aRootBox)
 {
@@ -372,29 +327,3 @@ nsBoxLayoutState::RecycleFreedMemory(nsIPresShell* aShell, void* aMem)
   size_t* sz = (size_t*)aMem;
   aShell->FreeFrame(*sz, aMem);
 }
-
-nsresult
-nsBoxLayoutState::GetPresShell(nsIPresShell** aShell)
-{
-  NS_IF_ADDREF(*aShell = mPresContext->GetPresShell());
-  return NS_OK;
-}
-
-nsresult
-nsBoxLayoutState::PushStackMemory()
-{
-  return mPresContext->PresShell()->PushStackMemory();
-}
-
-nsresult
-nsBoxLayoutState::PopStackMemory()
-{
-  return mPresContext->PresShell()->PopStackMemory();
-}
-
-nsresult
-nsBoxLayoutState::AllocateStackMemory(size_t aSize, void** aResult)
-{
-  return mPresContext->PresShell()->AllocateStackMemory(aSize, aResult);
-}
-
diff --git a/mozilla/layout/xul/base/src/nsBoxLayoutState.h b/mozilla/layout/xul/base/src/nsBoxLayoutState.h
index 8876030489c..a88eb088a48 100644
--- a/mozilla/layout/xul/base/src/nsBoxLayoutState.h
+++ b/mozilla/layout/xul/base/src/nsBoxLayoutState.h
@@ -67,54 +67,56 @@ public:
     Initial
   };
 
-  nsBoxLayoutState(nsIPresContext* aPresContext, const nsHTMLReflowState& aReflowState, nsHTMLReflowMetrics& aDesiredSize);
-  nsBoxLayoutState(nsIPresContext* aPresContext);
-  nsBoxLayoutState(nsIPresShell* aShell);
-  nsBoxLayoutState(const nsBoxLayoutState& aState);
-  virtual ~nsBoxLayoutState() {}
+  nsBoxLayoutState(nsIPresContext* aPresContext,
+                   const nsHTMLReflowState& aReflowState,
+                   nsHTMLReflowMetrics& aDesiredSize) NS_HIDDEN;
+  nsBoxLayoutState(nsIPresContext* aPresContext) NS_HIDDEN;
+  nsBoxLayoutState(nsIPresShell* aShell) NS_HIDDEN;
+  nsBoxLayoutState(const nsBoxLayoutState& aState) NS_HIDDEN;
 
-  virtual void HandleReflow(nsIBox* aRootBox);
+  NS_HIDDEN_(void) HandleReflow(nsIBox* aRootBox);
 
-  virtual nsIPresContext* GetPresContext() { return mPresContext.get(); }
-  virtual nsresult GetPresShell(nsIPresShell** aShell);
-  virtual nscoord* GetMaxElementWidth();
+  nsIPresContext* PresContext() { return mPresContext; }
+  nsIPresShell*   PresShell() { return mPresContext->PresShell(); }
+  nscoord* GetMaxElementWidth() { return mReflowState ? mMaxElementWidth : nsnull; }
 
-  virtual void GetScrolledBlockSizeConstraint(nsSize& aSize);
-  virtual void SetScrolledBlockSizeConstraint(const nsSize& aSize);
-  virtual void GetIncludeOverFlow(PRBool& aOverFlow);
-  virtual void SetIncludeOverFlow(const PRBool& aOverFlow);
-  virtual void GetLayoutFlags(PRUint32& aFlags);
-  virtual void SetLayoutFlags(const PRUint32& aFlags);
+  nsSize ScrolledBlockSizeConstraint() const
+  { return mScrolledBlockSizeConstraint; }
+  void SetScrolledBlockSizeConstraint(const nsSize& aSize)
+  { mScrolledBlockSizeConstraint = aSize; }
+  PRUint32 LayoutFlags() const { return mLayoutFlags; }
+  void SetLayoutFlags(PRUint32 aFlags) { mLayoutFlags = aFlags; }
 
   // if true no one under us will paint during reflow.
-  virtual void SetDisablePainting(PRBool aDisable) { mDisablePainting = aDisable; }
-  virtual PRBool GetDisablePainting() { return mDisablePainting; }
+  void SetPaintingDisabled(PRBool aDisable) { mPaintingDisabled = aDisable; }
+  PRBool PaintingDisabled() const { return mPaintingDisabled; }
 
-  virtual eBoxLayoutReason GetLayoutReason() { return mType; }
-  virtual void SetLayoutReason(eBoxLayoutReason aReason) { mType = aReason; }
-  virtual const nsHTMLReflowState* GetReflowState() { return mReflowState; }
+  eBoxLayoutReason LayoutReason() { return mType; }
+  void SetLayoutReason(eBoxLayoutReason aReason) { mType = aReason; }
+  const nsHTMLReflowState* GetReflowState() { return mReflowState; }
 
-  static void* Allocate(size_t sz, nsIPresShell* aPresShell);
-  static void Free(void* aPtr, size_t sz);
-  static void RecycleFreedMemory(nsIPresShell* aPresShell, void* mem);
+  static NS_HIDDEN_(void*) Allocate(size_t sz, nsIPresShell* aPresShell);
+  static NS_HIDDEN_(void) Free(void* aPtr, size_t sz);
+  static NS_HIDDEN_(void) RecycleFreedMemory(nsIPresShell* aPresShell,
+                                             void* mem);
 
-  nsresult PushStackMemory();
-  nsresult PopStackMemory();
-  nsresult AllocateStackMemory(size_t aSize, void** aResult);
+  nsresult PushStackMemory() { return PresShell()->PushStackMemory(); }
+  nsresult PopStackMemory()  { return PresShell()->PopStackMemory(); }
+  nsresult AllocateStackMemory(size_t aSize, void** aResult)
+  { return PresShell()->AllocateStackMemory(aSize, aResult); }
 
 private:
   //void DirtyAllChildren(nsBoxLayoutState& aState, nsIBox* aBox);
-  void Unwind(nsReflowPath* aReflowPath, nsIBox* aRootBox);
-  nsIBox* GetBoxForFrame(nsIFrame* aFrame, PRBool& aIsAdaptor);
+  NS_HIDDEN_(void) Unwind(nsReflowPath* aReflowPath, nsIBox* aRootBox);
+  NS_HIDDEN_(nsIBox*) GetBoxForFrame(nsIFrame* aFrame, PRBool& aIsAdaptor);
 
   nsCOMPtr<nsIPresContext> mPresContext;
   const nsHTMLReflowState* mReflowState;
   eBoxLayoutReason mType;
   nscoord* mMaxElementWidth;
   nsSize mScrolledBlockSizeConstraint;
-  PRBool mIncludeOverFlow;
   PRUint32 mLayoutFlags;
-  PRBool mDisablePainting;
+  PRBool mPaintingDisabled;
 };
 
 #endif
diff --git a/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp b/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp
index ffc508a3dab..6f04f5bd24e 100644
--- a/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxToBlockAdaptor.cpp
@@ -274,8 +274,7 @@ nsBoxToBlockAdaptor::SetIncludeOverflow(PRBool aInclude)
 
 static PRBool
 UseHTMLReflowConstraints(nsBoxToBlockAdaptor* aAdaptor, nsBoxLayoutState& aState) {
-  nsSize constrainedSize;
-  aState.GetScrolledBlockSizeConstraint(constrainedSize);
+  nsSize constrainedSize = aState.ScrolledBlockSizeConstraint();
   if (constrainedSize.width < 0 || constrainedSize.height < 0) {
     return PR_FALSE;
   }
@@ -318,7 +317,7 @@ nsBoxToBlockAdaptor::RefreshSizeCache(nsBoxLayoutState& aState)
   nsresult rv = NS_OK;
   const nsHTMLReflowState* reflowState = aState.GetReflowState();
   if (reflowState) {
-    nsIPresContext* presContext = aState.GetPresContext();
+    nsIPresContext* presContext = aState.PresContext();
     nsReflowStatus status = NS_FRAME_COMPLETE;
     nsHTMLReflowMetrics desiredSize(PR_FALSE);
     nsReflowReason reason;
@@ -359,8 +358,7 @@ nsBoxToBlockAdaptor::RefreshSizeCache(nsBoxLayoutState& aState)
       rect.height = NS_UNCONSTRAINEDSIZE;
     }
     if (useHTMLConstraints) {
-      nsSize constrained;
-      aState.GetScrolledBlockSizeConstraint(constrained);
+      nsSize constrained = aState.ScrolledBlockSizeConstraint();
       rect.width = constrained.width;
       rect.height = constrained.height;
     }
@@ -609,7 +607,7 @@ nsBoxToBlockAdaptor::DoLayout(nsBoxLayoutState& aState)
   GetBounds(ourRect);
 
   const nsHTMLReflowState* reflowState = aState.GetReflowState();
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
   nsReflowStatus status = NS_FRAME_COMPLETE;
   nsHTMLReflowMetrics desiredSize(PR_FALSE);
   nsresult rv = NS_OK;
@@ -943,8 +941,7 @@ nsBoxToBlockAdaptor::Reflow(nsBoxLayoutState& aState,
     if (mLastSize.width != aDesiredSize.width || mLastSize.height != aDesiredSize.height)
        changedSize = PR_TRUE;
   
-    PRUint32 layoutFlags;
-    aState.GetLayoutFlags(layoutFlags);
+    PRUint32 layoutFlags = aState.LayoutFlags();
     nsContainerFrame::FinishReflowChild(mFrame, aPresContext, &reflowState,
                                         aDesiredSize, aX, aY, layoutFlags | NS_FRAME_NO_MOVE_FRAME);
   } else {
diff --git a/mozilla/layout/xul/base/src/nsContainerBox.cpp b/mozilla/layout/xul/base/src/nsContainerBox.cpp
index 4d171ddc8ea..724a3f5e8cb 100644
--- a/mozilla/layout/xul/base/src/nsContainerBox.cpp
+++ b/mozilla/layout/xul/base/src/nsContainerBox.cpp
@@ -116,8 +116,7 @@ nsContainerBox::GetChildCount()
 PRInt32 
 nsContainerBox::CreateBoxList(nsBoxLayoutState& aState, nsIFrame* aFrameList, nsIBox*& aFirst, nsIBox*& aLast)
 {
-  nsCOMPtr<nsIPresShell> shell;
-  aState.GetPresShell(getter_AddRefs(shell));
+  nsIPresShell *shell = aState.PresShell();
 
   PRInt32 count = 0;
   if (aFrameList) {
@@ -287,9 +286,7 @@ nsContainerBox::RemoveAfter(nsBoxLayoutState& aState, nsIBox* aPrevious)
     nsIBoxToBlockAdaptor* adaptor = nsnull;
 
     if (NS_SUCCEEDED(toDelete->QueryInterface(NS_GET_IID(nsIBoxToBlockAdaptor), (void**)&adaptor)) && adaptor) {
-       nsCOMPtr<nsIPresShell> shell;
-       aState.GetPresShell(getter_AddRefs(shell));
-       adaptor->Recycle(shell);
+       adaptor->Recycle(aState.PresShell());
     }
 
     mChildCount--;
@@ -312,9 +309,7 @@ nsContainerBox::ClearChildren(nsBoxLayoutState& aState)
       nsIBoxToBlockAdaptor* adaptor = nsnull;
 
       if (NS_SUCCEEDED(it->QueryInterface(NS_GET_IID(nsIBoxToBlockAdaptor), (void**)&adaptor)) && adaptor) {
-         nsCOMPtr<nsIPresShell> shell;
-         aState.GetPresShell(getter_AddRefs(shell));
-         adaptor->Recycle(shell);
+         adaptor->Recycle(aState.PresShell());
       }
    }
 
@@ -603,8 +598,7 @@ nsContainerBox::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent)
 NS_IMETHODIMP
 nsContainerBox::DoLayout(nsBoxLayoutState& aState)
 {
-  PRUint32 oldFlags = 0;
-  aState.GetLayoutFlags(oldFlags);
+  PRUint32 oldFlags = aState.LayoutFlags();
   aState.SetLayoutFlags(0);
 
   nsresult rv = NS_OK;
@@ -645,7 +639,7 @@ nsContainerBox::LayoutChildAt(nsBoxLayoutState& aState, nsIBox* aBox, const nsRe
   aBox->HasDirtyChildren(dirtyChildren);
 
   PRBool layout = PR_TRUE;
-  if (!(dirty || dirtyChildren) && aState.GetLayoutReason() != nsBoxLayoutState::Initial) 
+  if (!(dirty || dirtyChildren) && aState.LayoutReason() != nsBoxLayoutState::Initial) 
      layout = PR_FALSE;
   
   if (layout || (oldRect.width != aRect.width || oldRect.height != aRect.height))  {
diff --git a/mozilla/layout/xul/base/src/nsDeckFrame.cpp b/mozilla/layout/xul/base/src/nsDeckFrame.cpp
index 7ad67f9e613..1cb185d1503 100644
--- a/mozilla/layout/xul/base/src/nsDeckFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsDeckFrame.cpp
@@ -289,10 +289,9 @@ nsDeckFrame::GetFrameForPoint(nsIPresContext*   aPresContext,
 NS_IMETHODIMP
 nsDeckFrame::DoLayout(nsBoxLayoutState& aState)
 {
-  // Make sure we tweek the state so it does not resize our children.
+  // Make sure we tweak the state so it does not resize our children.
   // We will do that.
-  PRUint32 oldFlags = 0;
-  aState.GetLayoutFlags(oldFlags);
+  PRUint32 oldFlags = aState.LayoutFlags();
   aState.SetLayoutFlags(NS_FRAME_NO_SIZE_VIEW | NS_FRAME_NO_VISIBILITY);
 
   // do a normal layout
@@ -307,9 +306,9 @@ nsDeckFrame::DoLayout(nsBoxLayoutState& aState)
   {
     // make collapsed children not show up
     if (count == mIndex) 
-      ShowBox(aState.GetPresContext(), box);
+      ShowBox(aState.PresContext(), box);
     else
-      HideBox(aState.GetPresContext(), box);
+      HideBox(aState.PresContext(), box);
 
     nsresult rv2 = box->GetNextBox(&box);
     NS_ASSERTION(NS_SUCCEEDED(rv2), "failed to get next child");
diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
index f6a41554479..04b9a861e36 100644
--- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -355,12 +355,12 @@ NS_IMETHODIMP
 nsListBoxBodyFrame::DoLayout(nsBoxLayoutState& aBoxLayoutState)
 {
   if (mScrolling)
-    aBoxLayoutState.SetDisablePainting(PR_TRUE);
+    aBoxLayoutState.SetPaintingDisabled(PR_TRUE);
 
   nsresult rv = nsBoxFrame::DoLayout(aBoxLayoutState);
 
   if (mScrolling)
-    aBoxLayoutState.SetDisablePainting(PR_FALSE);
+    aBoxLayoutState.SetPaintingDisabled(PR_FALSE);
 
   // if we are scrolled and the row height changed
   // make sure we are scrolled to a correct index.
@@ -746,7 +746,7 @@ nsListBoxBodyFrame::ComputeIntrinsicWidth(nsBoxLayoutState& aBoxLayoutState)
 
   if (firstRowContent) {
     nsRefPtr<nsStyleContext> styleContext;
-    nsIPresContext *presContext = aBoxLayoutState.GetPresContext();
+    nsIPresContext *presContext = aBoxLayoutState.PresContext();
     styleContext = presContext->StyleSet()->
       ResolveStyleFor(firstRowContent, nsnull);
 
@@ -770,7 +770,7 @@ nsListBoxBodyFrame::ComputeIntrinsicWidth(nsBoxLayoutState& aBoxLayoutState)
       nsIContent *child = listbox->GetChildAt(i);
 
       if (child->Tag() == nsXULAtoms::listitem) {
-        nsIPresContext* presContext = aBoxLayoutState.GetPresContext();
+        nsIPresContext* presContext = aBoxLayoutState.PresContext();
         nsIRenderingContext* rendContext = aBoxLayoutState.GetReflowState()->rendContext;
         if (rendContext) {
           nsAutoString value;
@@ -1476,7 +1476,7 @@ nsListboxScrollPortFrame::GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize&
     nsCOMPtr<nsIScrollableFrame> scrollFrame(do_QueryInterface(mParent));
     if (scrollFrame) {
       nsIScrollableFrame::nsScrollPref scrollPref;
-      scrollFrame->GetScrollPreference(aBoxLayoutState.GetPresContext(), &scrollPref);
+      scrollFrame->GetScrollPreference(aBoxLayoutState.PresContext(), &scrollPref);
 
       if (scrollPref == nsIScrollableFrame::Auto) {
         nsMargin scrollbars = scrollFrame->GetDesiredScrollbarSizes(&aBoxLayoutState);
@@ -1513,7 +1513,7 @@ nsListboxScrollPortFrame::GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize&
   nsCOMPtr<nsIScrollableFrame> scrollFrame(do_QueryInterface(mParent));
   if (scrollFrame) {
     nsIScrollableFrame::nsScrollPref scrollPref;
-    scrollFrame->GetScrollPreference(aBoxLayoutState.GetPresContext(), &scrollPref);
+    scrollFrame->GetScrollPreference(aBoxLayoutState.PresContext(), &scrollPref);
 
     if (scrollPref == nsIScrollableFrame::Auto) {
       nsMargin scrollbars = scrollFrame->GetDesiredScrollbarSizes(&aBoxLayoutState);
diff --git a/mozilla/layout/xul/base/src/nsListBoxLayout.cpp b/mozilla/layout/xul/base/src/nsListBoxLayout.cpp
index a80f97e7f25..92b2c371aeb 100644
--- a/mozilla/layout/xul/base/src/nsListBoxLayout.cpp
+++ b/mozilla/layout/xul/base/src/nsListBoxLayout.cpp
@@ -196,7 +196,7 @@ nsListBoxLayout::LayoutInternal(nsIBox* aBox, nsBoxLayoutState& aState)
   body->GetChildBox(&box);
 
   // if the reason is resize or initial we must relayout.
-  PRBool relayout = (aState.GetLayoutReason() == nsBoxLayoutState::Resize || aState.GetLayoutReason() == nsBoxLayoutState::Initial);
+  PRBool relayout = (aState.LayoutReason() == nsBoxLayoutState::Resize || aState.LayoutReason() == nsBoxLayoutState::Initial);
   nscoord rowHeight = body->GetRowHeightTwips();
 
   while (box) {
diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
index ebd60527453..b2ba9175539 100644
--- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
@@ -1010,7 +1010,7 @@ nsMenuFrame::DoLayout(nsBoxLayoutState& aState)
     nsCOMPtr<nsIScrollableFrame> scrollframe(do_QueryInterface(child));
     if (scrollframe) {
       nsIScrollableFrame::nsScrollPref pref;
-      scrollframe->GetScrollPreference(aState.GetPresContext(), &pref);
+      scrollframe->GetScrollPreference(aState.PresContext(), &pref);
 
       if (pref == nsIScrollableFrame::Auto)  
       {
@@ -1151,7 +1151,7 @@ static void ConvertPosition(nsIContent* aPopupElt, nsString& aAnchor, nsString&
 void
 nsMenuFrame::RePositionPopup(nsBoxLayoutState& aState)
 {  
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
 
   // Sync up the view.
   nsIFrame* frame = mPopupFrames.FirstChild();
diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp
index ff787bd3a59..cc25f8e7f74 100644
--- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -269,9 +269,7 @@ nsMenuPopupFrame::MarkStyleChange(nsBoxLayoutState& aState)
     else {
       nsIFrame* frame = nsnull;
       GetFrame(&frame);
-      nsCOMPtr<nsIPresShell> shell;
-      aState.GetPresShell(getter_AddRefs(shell));
-      return frame->GetParent()->ReflowDirtyChild(shell, frame);
+      return frame->GetParent()->ReflowDirtyChild(aState.PresShell(), frame);
     }
   }
   return NS_OK;
@@ -322,9 +320,7 @@ nsMenuPopupFrame::MarkDirty(nsBoxLayoutState& aState)
       box->MarkDirtyChildren(state); // Mark the popupset as dirty.
     }
     else {
-      nsCOMPtr<nsIPresShell> shell;
-      aState.GetPresShell(getter_AddRefs(shell));
-      return frame->GetParent()->ReflowDirtyChild(shell, frame);
+      return frame->GetParent()->ReflowDirtyChild(aState.PresShell(), frame);
     }
   }
 
diff --git a/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp b/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp
index 978a9881c45..0c1cc70aa70 100644
--- a/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsNativeScrollbarFrame.cpp
@@ -274,7 +274,7 @@ NS_IMETHODIMP
 nsNativeScrollbarFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
 {
   float p2t = 0.0;
-  p2t = aState.GetPresContext()->PixelsToTwips();
+  p2t = aState.PresContext()->PixelsToTwips();
   
   PRInt32 narrowDimension = 0;
   nsCOMPtr<nsINativeScrollbar> native ( do_QueryInterface(mScrollbar) );
diff --git a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp
index ecee7ec67c0..4c7fc9e16de 100644
--- a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp
@@ -254,7 +254,7 @@ nsPopupSetFrame::DoLayout(nsBoxLayoutState& aState)
       nsCOMPtr<nsIScrollableFrame> scrollframe = do_QueryInterface(child);
       if (scrollframe) {
         nsIScrollableFrame::nsScrollPref pref;
-        scrollframe->GetScrollPreference(aState.GetPresContext(), &pref);
+        scrollframe->GetScrollPreference(aState.PresContext(), &pref);
 
         if (pref == nsIScrollableFrame::Auto)  
         {
@@ -339,7 +339,7 @@ nsPopupSetFrame::RepositionPopup(nsPopupFrameList* aEntry, nsBoxLayoutState& aSt
   // Sync up the view.
   if (aEntry && aEntry->mElementContent) {
     nsIFrame* frameToSyncTo = nsnull;
-    nsIPresContext* presContext = aState.GetPresContext();
+    nsIPresContext* presContext = aState.PresContext();
     presContext->PresShell()->GetPrimaryFrameFor(aEntry->mElementContent,
                                                  &frameToSyncTo );
     ((nsMenuPopupFrame*)(aEntry->mPopupFrame))->SyncViewWithFrame(presContext, 
diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp
index 15efc5f4874..d38fda716e0 100644
--- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp
@@ -290,8 +290,7 @@ nsScrollBoxFrame::GetBorder(nsMargin& aMargin)
 NS_IMETHODIMP
 nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState)
 {
-  PRUint32 oldflags = 0;
-  aState.GetLayoutFlags(oldflags);
+  PRUint32 oldflags = aState.LayoutFlags();
 
   nsRect clientRect(0,0,0,0);
   GetClientRect(clientRect);
@@ -302,7 +301,7 @@ nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState)
   kid->GetMargin(margin);
   childRect.Deflate(margin);
 
-  nsIPresContext* presContext = aState.GetPresContext();
+  nsIPresContext* presContext = aState.PresContext();
 
   // see if our child is html. If it is then
   // never include the overflow. The child will be the size
@@ -407,8 +406,7 @@ nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState)
     horizChanged = PR_TRUE;
   }
 
-  nsCOMPtr<nsIPresShell> shell;
-  aState.GetPresShell(getter_AddRefs(shell));
+  nsCOMPtr<nsIPresShell> shell = aState.PresShell();
 
   // if either changed
   if (vertChanged || horizChanged) 
diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
index 80be23538f2..2779558e5a3 100644
--- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
@@ -374,7 +374,7 @@ nsSliderFrame::DoLayout(nsBoxLayoutState& aState)
      curpospx = maxpospx;
 
   float p2t;
-  aState.GetPresContext()->GetScaledPixelsToTwips(&p2t);
+  aState.PresContext()->GetScaledPixelsToTwips(&p2t);
   nscoord onePixel = NSIntPixelsToTwips(1, p2t);
 
   // get max pos in twips
diff --git a/mozilla/layout/xul/base/src/nsSprocketLayout.cpp b/mozilla/layout/xul/base/src/nsSprocketLayout.cpp
index 96f908864c9..10109278142 100644
--- a/mozilla/layout/xul/base/src/nsSprocketLayout.cpp
+++ b/mozilla/layout/xul/base/src/nsSprocketLayout.cpp
@@ -469,7 +469,7 @@ nsSprocketLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
         PRBool dirtyChildren = PR_FALSE;           
         child->IsDirty(dirty);
         child->HasDirtyChildren(dirtyChildren);
-        if (!(dirty || dirtyChildren) && aState.GetLayoutReason() != nsBoxLayoutState::Initial)
+        if (!(dirty || dirtyChildren) && aState.LayoutReason() != nsBoxLayoutState::Initial)
           layout = PR_FALSE;
       }
 
@@ -1117,7 +1117,7 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
 {  
 
  // float p2t;
- // aState.GetPresContext()->GetScaledPixelsToTwips(&p2t);
+ // aState.PresContext()->GetScaledPixelsToTwips(&p2t);
   //nscoord onePixel = NSIntPixelsToTwips(1, p2t);
 
   PRInt32 sizeRemaining            = aGivenSize;
diff --git a/mozilla/layout/xul/base/src/nsStackLayout.cpp b/mozilla/layout/xul/base/src/nsStackLayout.cpp
index bc5a8474b80..d9702b60348 100644
--- a/mozilla/layout/xul/base/src/nsStackLayout.cpp
+++ b/mozilla/layout/xul/base/src/nsStackLayout.cpp
@@ -218,7 +218,7 @@ nsStackLayout::AddOffset(nsBoxLayoutState& aState, nsIBox* aChild, nsSize& aSize
   nsIContent* content = frame->GetContent();
 
   if (content) {
-    nsIPresContext* presContext = aState.GetPresContext();
+    nsIPresContext* presContext = aState.PresContext();
     nsAutoString value;
     PRInt32 error;
 
diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
index b8fd4d90b48..d99b17e0184 100644
--- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -790,7 +790,7 @@ nsTextBoxFrame::CalcTextSize(nsBoxLayoutState& aBoxLayoutState)
     if (mNeedsRecalc)
     {
         nsSize size;
-        nsIPresContext* presContext = aBoxLayoutState.GetPresContext();
+        nsIPresContext* presContext = aBoxLayoutState.PresContext();
         const nsHTMLReflowState* rstate = aBoxLayoutState.GetReflowState();
         if (!rstate)
             return;