diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 72d87d35ed6..210d449f756 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
-  nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
+  nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
                           &aReflowState, nsnull != aMetrics.maxElementSize);
-	if (! lineLayout) {
-		return NS_ERROR_OUT_OF_MEMORY;
-	}
   nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
-                           lineLayout);
-  lineLayout->Init(&state);
+                           &lineLayout);
+  lineLayout.Init(&state);
   if (NS_BLOCK_MARGIN_ROOT & mFlags) {
     state.mIsMarginRoot = PR_TRUE;
   }
@@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
          aMetrics.width, aMetrics.height,
          aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
 #endif
-  delete lineLayout;
   return rv;
 }
 
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 72d87d35ed6..210d449f756 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
-  nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
+  nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
                           &aReflowState, nsnull != aMetrics.maxElementSize);
-	if (! lineLayout) {
-		return NS_ERROR_OUT_OF_MEMORY;
-	}
   nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
-                           lineLayout);
-  lineLayout->Init(&state);
+                           &lineLayout);
+  lineLayout.Init(&state);
   if (NS_BLOCK_MARGIN_ROOT & mFlags) {
     state.mIsMarginRoot = PR_TRUE;
   }
@@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
          aMetrics.width, aMetrics.height,
          aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
 #endif
-  delete lineLayout;
   return rv;
 }
 
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index 72d87d35ed6..210d449f756 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
-  nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
+  nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
                           &aReflowState, nsnull != aMetrics.maxElementSize);
-	if (! lineLayout) {
-		return NS_ERROR_OUT_OF_MEMORY;
-	}
   nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
-                           lineLayout);
-  lineLayout->Init(&state);
+                           &lineLayout);
+  lineLayout.Init(&state);
   if (NS_BLOCK_MARGIN_ROOT & mFlags) {
     state.mIsMarginRoot = PR_TRUE;
   }
@@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
          aMetrics.width, aMetrics.height,
          aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
 #endif
-  delete lineLayout;
   return rv;
 }
 
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 72d87d35ed6..210d449f756 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
-  nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
+  nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
                           &aReflowState, nsnull != aMetrics.maxElementSize);
-	if (! lineLayout) {
-		return NS_ERROR_OUT_OF_MEMORY;
-	}
   nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
-                           lineLayout);
-  lineLayout->Init(&state);
+                           &lineLayout);
+  lineLayout.Init(&state);
   if (NS_BLOCK_MARGIN_ROOT & mFlags) {
     state.mIsMarginRoot = PR_TRUE;
   }
@@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
          aMetrics.width, aMetrics.height,
          aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
 #endif
-  delete lineLayout;
   return rv;
 }
 
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index 72d87d35ed6..210d449f756 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
-  nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
+  nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
                           &aReflowState, nsnull != aMetrics.maxElementSize);
-	if (! lineLayout) {
-		return NS_ERROR_OUT_OF_MEMORY;
-	}
   nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
-                           lineLayout);
-  lineLayout->Init(&state);
+                           &lineLayout);
+  lineLayout.Init(&state);
   if (NS_BLOCK_MARGIN_ROOT & mFlags) {
     state.mIsMarginRoot = PR_TRUE;
   }
@@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
          aMetrics.width, aMetrics.height,
          aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
 #endif
-  delete lineLayout;
   return rv;
 }
 
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index 72d87d35ed6..210d449f756 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -900,14 +900,11 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
                      const nsHTMLReflowState& aReflowState,
                      nsReflowStatus&          aStatus)
 {
-  nsLineLayout* lineLayout = new nsLineLayout(aPresContext, aReflowState.spaceManager,
+  nsLineLayout lineLayout(aPresContext, aReflowState.spaceManager,
                           &aReflowState, nsnull != aMetrics.maxElementSize);
-	if (! lineLayout) {
-		return NS_ERROR_OUT_OF_MEMORY;
-	}
   nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
-                           lineLayout);
-  lineLayout->Init(&state);
+                           &lineLayout);
+  lineLayout.Init(&state);
   if (NS_BLOCK_MARGIN_ROOT & mFlags) {
     state.mIsMarginRoot = PR_TRUE;
   }
@@ -991,7 +988,6 @@ nsBlockFrame::Reflow(nsIPresContext&          aPresContext,
          aMetrics.width, aMetrics.height,
          aMetrics.mCarriedOutTopMargin, aMetrics.mCarriedOutBottomMargin);
 #endif
-  delete lineLayout;
   return rv;
 }