Removal of nsSelectionRange, nsSelectionPoint, and fixing up resulting include problems.

content/base/src/nsGenericDOMDataNode.cpp

@@ -25,7 +25,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsXIFConverter.h"
-#include "nsSelectionRange.h"
 #include "nsRange.h"
 
 #include "nsIDOMSelection.h"

layout/base/src/nsGenericDOMDataNode.cpp

@@ -25,7 +25,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsXIFConverter.h"
-#include "nsSelectionRange.h"
 #include "nsRange.h"
 
 #include "nsIDOMSelection.h"

layout/generic/nsBlockReflowContext.cpp

@@ -22,6 +22,7 @@
 #include "nsISpaceManager.h"
 #include "nsIFontMetrics.h"
 #include "nsIPresContext.h"
+#include "nsIContent.h"
 #include "nsIStyleContext.h"
 #include "nsHTMLContainerFrame.h"
 #include "nsBlockFrame.h"

layout/generic/nsFrame.h

@@ -21,8 +21,6 @@
 #include "nsIFrame.h"
 #include "nsIHTMLReflow.h"
 #include "nsRect.h"
-#include "nsSelectionRange.h"
-#include "nsSelectionPoint.h"
 #include "nsString.h"
 #include "prlog.h"
 

layout/generic/nsTextFrame.cpp

@@ -22,6 +22,7 @@
 #include "nsLineLayout.h"
 #include "nsString.h"
 #include "nsIPresContext.h"
+#include "nsIContent.h"
 #include "nsStyleConsts.h"
 #include "nsIStyleContext.h"
 #include "nsCoord.h"

layout/html/base/src/nsBlockReflowContext.cpp

@@ -22,6 +22,7 @@
 #include "nsISpaceManager.h"
 #include "nsIFontMetrics.h"
 #include "nsIPresContext.h"
+#include "nsIContent.h"
 #include "nsIStyleContext.h"
 #include "nsHTMLContainerFrame.h"
 #include "nsBlockFrame.h"

layout/html/base/src/nsFrame.h

@@ -21,8 +21,6 @@
 #include "nsIFrame.h"
 #include "nsIHTMLReflow.h"
 #include "nsRect.h"
-#include "nsSelectionRange.h"
-#include "nsSelectionPoint.h"
 #include "nsString.h"
 #include "prlog.h"
 

layout/html/base/src/nsTextFrame.cpp

@@ -22,6 +22,7 @@
 #include "nsLineLayout.h"
 #include "nsString.h"
 #include "nsIPresContext.h"
+#include "nsIContent.h"
 #include "nsStyleConsts.h"
 #include "nsIStyleContext.h"
 #include "nsCoord.h"

layout/html/forms/src/nsFormFrame.cpp

@@ -687,7 +687,7 @@ nsFormFrame::GetParentHTMLFrameDocument(nsIDocument* doc) {
   nsIDocument* parentDocument = nsnull;
   nsIScriptContextOwner* webshellOwner = nsnull;
   if (!doc) return nsnull;
-  if ((webshellOwner = doc->GetScriptContextOwner())) {
+  if ((webshellOwner = doc->GetScriptContextOwner()) != nsnull) {
     nsIWebShell* webshell = nsnull;
     if (NS_OK == webshellOwner->QueryInterface(kIWebshellIID, (void **)&webshell)) {
       nsIWebShell* pWebshell = nsnull;

layout/html/forms/src/nsFormFrame.h

@@ -31,9 +31,10 @@ class  nsFormControlFrame;
 class  nsRadioControlFrame;
 class  nsIFormControlFrame;
 class  nsIDOMHTMLFormElement;
-
+class nsIDocument;
 class nsIPresContext;
 class nsFormFrame;
+
 // XXX these structs and gFormFrameTable below provide a faster way to get from a form content to
 // the appropriate frame. Before replacing this mechanism with FindFrameWithContent, please test
 // a page with thousands of frames and hundreds of form controls.

layout/html/table/src/nsTableColFrame.h

@@ -21,6 +21,8 @@
 #include "nscore.h"
 #include "nsContainerFrame.h"
 
+class nsVoidArray;
+
 class nsTableColFrame : public nsFrame {
 public:
 

layout/tables/nsTableColFrame.h

@@ -21,6 +21,8 @@
 #include "nscore.h"
 #include "nsContainerFrame.h"
 
+class nsVoidArray;
+
 class nsTableColFrame : public nsFrame {
 public:
 

layout/xul/base/src/nsBoxFrame.cpp

@@ -27,6 +27,7 @@
 #include "nsBoxFrame.h"
 #include "nsIStyleContext.h"
 #include "nsIPresContext.h"
+#include "nsIContent.h"
 #include "nsCOMPtr.h"
 #include "nsHTMLIIDs.h"
 #include "nsUnitConversion.h"

layout/xul/base/src/nsProgressMeterFrame.cpp

@@ -33,6 +33,7 @@ static int   ANIMATION_SPEED = 50;    // miliseconds
 #include "nsProgressMeterFrame.h"
 #include "nsIStyleContext.h"
 #include "nsCSSRendering.h"
+#include "nsIContent.h"
 #include "nsIPresContext.h"
 #include "nsHTMLAtoms.h"
 #include "nsXULAtoms.h"

layout/xul/base/src/nsTreeCellFrame.cpp

@@ -25,6 +25,7 @@
 #include "nsIStyleContext.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
+#include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIStyleSet.h"
 #include "nsIViewManager.h"

layout/xul/base/src/nsTreeIndentationFrame.cpp

@@ -24,6 +24,7 @@
 #include "nsXULAtoms.h"
 #include "nsUnitConversion.h"
 #include "nsIStyleContext.h"
+#include "nsIContent.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsTreeIndentationFrame.h"