From 0144cd1c8baaab7f6095b350f9e55df2006cc343 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Wed, 18 Feb 2009 17:13:25 -0800
Subject: [PATCH] Remove PerFrameData::mFrameType, since it's write-only.  (Bug
 478899)  r+sr=bzbarsky

---
 layout/generic/nsLineLayout.cpp | 3 ---
 layout/generic/nsLineLayout.h   | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 1b6b3cf9eaa..92ea6b332bb 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -789,7 +789,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
   pfd->mFrame = aFrame;
   pfd->mMargin = reflowState.mComputedMargin;
   pfd->mBorderPadding = reflowState.mComputedBorderPadding;
-  pfd->mFrameType = reflowState.mFrameType;
   pfd->SetFlag(PFD_RELATIVEPOS,
                (reflowState.mStyleDisplay->mPosition == NS_STYLE_POSITION_RELATIVE));
   if (pfd->GetFlag(PFD_RELATIVEPOS)) {
@@ -1334,7 +1333,6 @@ nsLineLayout::AddBulletFrame(nsIFrame* aFrame,
     pfd->mFrame = aFrame;
     pfd->mMargin.SizeTo(0, 0, 0, 0);
     pfd->mBorderPadding.SizeTo(0, 0, 0, 0);
-    pfd->mFrameType = NS_FRAME_REPLACED(NS_CSS_FRAME_TYPE_INLINE);
     pfd->mFlags = 0;  // all flags default to false
     pfd->SetFlag(PFD_ISBULLET, PR_TRUE);
     if (aMetrics.ascent == nsHTMLReflowMetrics::ASK_FOR_BASELINE)
@@ -1380,7 +1378,6 @@ nsLineLayout::VerticalAlignLine()
   // Synthesize a PerFrameData for the block frame
   PerFrameData rootPFD;
   rootPFD.mFrame = mBlockReflowState->frame;
-  rootPFD.mFrameType = mBlockReflowState->mFrameType;
   rootPFD.mAscent = 0;
   mRootSpan->mFrame = &rootPFD;
 
diff --git a/layout/generic/nsLineLayout.h b/layout/generic/nsLineLayout.h
index e004f18e68e..6da00830bcc 100644
--- a/layout/generic/nsLineLayout.h
+++ b/layout/generic/nsLineLayout.h
@@ -443,9 +443,8 @@ protected:
     // pointer to child span data if this is an inline container frame
     PerSpanData* mSpan;
 
-    // The frame and its type
+    // The frame
     nsIFrame* mFrame;
-    nsCSSFrameType mFrameType;
 
     // From metrics
     nscoord mAscent;