tweaked

layout/generic/nsLineLayout.cpp

@@ -95,6 +95,7 @@ nsLineLayout::nsLineLayout(nsIPresContext& aPresContext,
   : mPresContext(aPresContext),
     mSpaceManager(aSpaceManager),
     mBlockReflowState(aOuterReflowState),
+    mBlockRS(nsnull),/* XXX temporary */
     mComputeMaxElementSize(aComputeMaxElementSize)
 {
   // Stash away some style data that we need

layout/html/base/src/nsHTMLIIDs.cpp

@@ -17,12 +17,13 @@
  */
 #include "nsHTMLIIDs.h"
 #include "nsIHTMLContent.h"
-#include "nsIAnchoredItems.h"
 #include "nsIHTMLReflow.h"
 #include "nsIPageSequenceFrame.h"
+#include "nsITextContent.h"
 
 const nsIID kIHTMLContentIID = NS_IHTMLCONTENT_IID;
-const nsIID kIStyledContentIID = NS_ISTYLEDCONTENT_IID;
 const nsIID kIHTMLReflowIID = NS_IHTMLREFLOW_IID;
 const nsIID kIPageSequenceFrameIID = NS_IPAGESEQUENCEFRAME_IID;
+const nsIID kIStyledContentIID = NS_ISTYLEDCONTENT_IID;
+const nsIID kITextContentIID = NS_ITEXT_CONTENT_IID;
 

layout/html/base/src/nsHTMLIIDs.h

@@ -20,11 +20,11 @@
 
 #include "nsISupports.h"
 
-extern const nsIID kIAbsoluteItemsIID;
+// Alphabetically ordered list of externally defined IID's
 extern const nsIID kIHTMLContentIID;
-extern const nsIID kIStyledContentIID;
-extern const nsIID kIRunaroundIID;
 extern const nsIID kIHTMLReflowIID;
 extern const nsIID kIPageSequenceFrameIID;
+extern const nsIID kIStyledContentIID;
+extern const nsIID kITextContentIID;
 
 #endif /* nsHTMLIIDs_h___ */

layout/html/base/src/nsLineLayout.cpp

@@ -95,6 +95,7 @@ nsLineLayout::nsLineLayout(nsIPresContext& aPresContext,
   : mPresContext(aPresContext),
     mSpaceManager(aSpaceManager),
     mBlockReflowState(aOuterReflowState),
+    mBlockRS(nsnull),/* XXX temporary */
     mComputeMaxElementSize(aComputeMaxElementSize)
 {
   // Stash away some style data that we need