diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp
index c1520d6b082..ae51a243a4f 100644
--- a/layout/base/nsBidiPresUtils.cpp
+++ b/layout/base/nsBidiPresUtils.cpp
@@ -315,6 +315,7 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
 {
   mLogicalFrames.Clear();
   mContentToFrameIndex.Clear();
+  mLinePerFrame.Clear();
   mBuffer.SetLength(0);
   
   nsPresContext *presContext = aBlockFrame->PresContext();
@@ -324,14 +325,6 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
   mParaLevel = (NS_STYLE_DIRECTION_RTL == vis->mDirection) ?
                 NSBIDI_RTL : NSBIDI_LTR;
 
-  mLineIter = new nsBlockInFlowLineIterator(aBlockFrame,
-                                            aBlockFrame->begin_lines(),
-                                            PR_FALSE);
-  if (mLineIter->GetLine() == aBlockFrame->end_lines()) {
-    // Advance to first valid line (might be in a next-continuation)
-    mLineIter->Next();
-  }
-
   mIsVisual = presContext->IsVisualMode();
   if (mIsVisual) {
     /**
@@ -357,7 +350,6 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
       }
     }
   }
-  mPrevFrame = nsnull;
 
   // handle bidi-override being set on the block itself before calling
   // InitLogicalArray.
@@ -372,6 +364,7 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
     }
     if (ch != 0) {
       mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+      mLinePerFrame.AppendElement((nsLineBox*)nsnull);
       mBuffer.Append(ch);
     }
   }
@@ -379,11 +372,14 @@ nsBidiPresUtils::Resolve(nsBlockFrame* aBlockFrame)
   for (nsBlockFrame* block = aBlockFrame; block;
        block = static_cast<nsBlockFrame*>(block->GetNextContinuation())) {
     block->RemoveStateBits(NS_BLOCK_NEEDS_BIDI_RESOLUTION);
-    InitLogicalArray(block->GetFirstChild(nsnull));
+    nsBlockInFlowLineIterator lineIter(block, block->begin_lines(), PR_FALSE);
+    mPrevFrame = nsnull;
+    InitLogicalArray(&lineIter, block->GetFirstChild(nsnull));
   }
 
   if (ch != 0) {
     mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+    mLinePerFrame.AppendElement((nsLineBox*)nsnull);
     mBuffer.Append(kPDF);
   }
 
@@ -429,7 +425,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
   PRInt32     contentTextLength;
 
   FramePropertyTable *propTable = presContext->PropertyTable();
-  PRBool lineNeedsUpdate = PR_FALSE;
+  nsLineBox* currentLine = nsnull;
   
 #ifdef DEBUG
 #ifdef NOISY_BIDI
@@ -449,7 +445,6 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
         break;
       }
       frame = mLogicalFrames[frameIndex];
-      lineNeedsUpdate = PR_TRUE;
       if (frame == NS_BIDI_CONTROL_FRAME ||
           nsGkAtoms::textFrame != frame->GetType()) {
         /*
@@ -460,6 +455,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
         fragmentLength = 1;
       }
       else {
+        currentLine = mLinePerFrame[frameIndex];
         content = frame->GetContent();
         if (!content) {
           mSuccess = NS_OK;
@@ -517,11 +513,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
            * The text in this frame continues beyond the end of this directional run.
            * Create a non-fluid continuation frame for the next directional run.
            */
-          if (lineNeedsUpdate) {
-            AdvanceLineIteratorToFrame(frame, mLineIter, mPrevFrame);
-            lineNeedsUpdate = PR_FALSE;
-          }
-          mLineIter->GetLine()->MarkDirty();
+          currentLine->MarkDirty();
           nsIFrame* nextBidi;
           PRInt32 runEnd = contentOffset + runLength;
           EnsureBidiContinuation(frame, &nextBidi, frameIndex,
@@ -571,11 +563,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame)
             }
           }
           frame->AdjustOffsetsForBidi(contentOffset, contentOffset + fragmentLength);
-          if (lineNeedsUpdate) {
-            AdvanceLineIteratorToFrame(frame, mLineIter, mPrevFrame);
-            lineNeedsUpdate = PR_FALSE;
-          }
-          mLineIter->GetLine()->MarkDirty();
+          currentLine->MarkDirty();
         }
       } // isTextFrame
       else {
@@ -642,7 +630,8 @@ PRBool IsBidiLeaf(nsIFrame* aFrame) {
 }
 
 void
-nsBidiPresUtils::InitLogicalArray(nsIFrame*    aCurrentFrame)
+nsBidiPresUtils::InitLogicalArray(nsBlockInFlowLineIterator* aLineIter,
+                                  nsIFrame*    aCurrentFrame)
 {
   if (!aCurrentFrame)
     return;
@@ -691,6 +680,7 @@ nsBidiPresUtils::InitLogicalArray(nsIFrame*    aCurrentFrame)
       // first frame of an element specifying embedding or override
       if (ch != 0 && !frame->GetPrevContinuation()) {
         mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+        mLinePerFrame.AppendElement((nsLineBox*)nsnull);
         mBuffer.Append(ch);
       }
     }
@@ -707,6 +697,9 @@ nsBidiPresUtils::InitLogicalArray(nsIFrame*    aCurrentFrame)
       }
       mLogicalFrames.AppendElement(frame);
 
+      AdvanceLineIteratorToFrame(frame, aLineIter, mPrevFrame);
+      mLinePerFrame.AppendElement(aLineIter->GetLine().get());
+
       // Append the content of the frame to the paragraph buffer
       nsIAtom* frameType = frame->GetType();
       if (nsGkAtoms::textFrame == frameType) {
@@ -726,7 +719,7 @@ nsBidiPresUtils::InitLogicalArray(nsIFrame*    aCurrentFrame)
     }
     else {
       nsIFrame* kid = frame->GetFirstChild(nsnull);
-      InitLogicalArray(kid);
+      InitLogicalArray(aLineIter, kid);
     }
 
     // If the element is attributed by dir, indicate direction pop (add PDF frame)
@@ -734,6 +727,7 @@ nsBidiPresUtils::InitLogicalArray(nsIFrame*    aCurrentFrame)
       // Add a dummy frame pointer representing a bidi control code after the
       // last frame of an element specifying embedding or override
       mLogicalFrames.AppendElement(NS_BIDI_CONTROL_FRAME);
+      mLinePerFrame.AppendElement((nsLineBox*)nsnull);
       mBuffer.Append(kPDF);
     }
   } // for
diff --git a/layout/base/nsBidiPresUtils.h b/layout/base/nsBidiPresUtils.h
index 61860f5ad03..59ecb6bcd87 100644
--- a/layout/base/nsBidiPresUtils.h
+++ b/layout/base/nsBidiPresUtils.h
@@ -367,7 +367,8 @@ private:
    * consistent directionality. At this point the frames are still in logical
    * order
    */
-  void InitLogicalArray(nsIFrame* aCurrentFrame);
+  void InitLogicalArray(nsBlockInFlowLineIterator* aLineIter,
+                        nsIFrame* aCurrentFrame);
 
   /**
    * Initialize the logically-ordered array of frames
@@ -509,6 +510,7 @@ private:
 
   nsAutoString    mBuffer;
   nsTArray<nsIFrame*> mLogicalFrames;
+  nsTArray<nsLineBox*> mLinePerFrame;
   nsTArray<nsIFrame*> mVisualFrames;
   nsDataHashtable<nsISupportsHashKey, PRInt32> mContentToFrameIndex;
   PRInt32         mArraySize;
@@ -520,7 +522,6 @@ private:
   nsIFrame*       mPrevFrame;
   nsIContent*     mPrevContent;
 
-  nsAutoPtr<nsBlockInFlowLineIterator> mLineIter;
   nsBidi*         mBidiEngine;
 };