Bug 1107721 - Add pointer to the base line layout in nsLineLayout. r=dbaron

2014-12-05 15:05:51 -08:00
parent 464b3de34d
commit 6737561b22
5 changed files with 20 additions and 5 deletions
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -51,10 +51,12 @@ using namespace mozilla;
 nsLineLayout::nsLineLayout(nsPresContext* aPresContext,
                           nsFloatManager* aFloatManager,
                           const nsHTMLReflowState* aOuterReflowState,
-                           const nsLineList::iterator* aLine)
+                           const nsLineList::iterator* aLine,
+                           nsLineLayout* aBaseLineLayout)
  : mPresContext(aPresContext),
    mFloatManager(aFloatManager),
    mBlockReflowState(aOuterReflowState),
+    mBaseLineLayout(aBaseLineLayout ? aBaseLineLayout->mBaseLineLayout : this),
    mLastOptionalBreakFrame(nullptr),
    mForceBreakFrame(nullptr),
    mBlockRS(nullptr),/* XXX temporary */