Bug 534366. Make nsFirstLineFrame set InlineReflowState::mLineLayout correctly. r=dbaron
authorRobert O'Callahan <robert@ocallahan.org>
Wed, 16 Dec 2009 09:08:59 +1300
changeset 36220 56f45a0843696fa46023290d3830443a9c419057
parent 36219 54d12a61953124dcfeb6683b02d4ad0cfd2d40d3
child 36221 10a331f111b807ac3fb36e1ef4cde32bc31cd662
push id10726
push userrocallahan@mozilla.com
push dateTue, 15 Dec 2009 20:09:44 +0000
treeherdermozilla-central@10a331f111b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs534366
milestone1.9.3a1pre
Bug 534366. Make nsFirstLineFrame set InlineReflowState::mLineLayout correctly. r=dbaron
layout/generic/nsInlineFrame.cpp
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -1005,16 +1005,17 @@ nsFirstLineFrame::Reflow(nsPresContext* 
     ReParentChildListStyle(aPresContext, newFrames, this);
   }
 
   // Set our own reflow state (additional state above and beyond
   // aReflowState)
   InlineReflowState irs;
   irs.mPrevFrame = nsnull;
   irs.mLineContainer = lineContainer;
+  irs.mLineLayout = aReflowState.mLineLayout;
   irs.mNextInFlow = (nsInlineFrame*) GetNextInFlow();
 
   nsresult rv;
   PRBool wasEmpty = mFrames.IsEmpty();
   if (wasEmpty) {
     // Try to pull over one frame before starting so that we know
     // whether we have an anonymous block or not.
     PRBool complete;