From bbe5a4f210d297ce47b4f9a137a590a2258a14c5 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Tue, 13 Apr 1999 01:15:16 +0000 Subject: [PATCH] Removal of nsSelectionRange, nsSelectionPoint, and fixing up resulting include problems. --- content/base/src/nsGenericDOMDataNode.cpp | 1 - layout/base/src/nsGenericDOMDataNode.cpp | 1 - layout/generic/nsBlockReflowContext.cpp | 1 + layout/generic/nsFrame.h | 2 -- layout/generic/nsTextFrame.cpp | 1 + layout/html/base/src/nsBlockReflowContext.cpp | 1 + layout/html/base/src/nsFrame.h | 2 -- layout/html/base/src/nsTextFrame.cpp | 1 + layout/html/forms/src/nsFormFrame.cpp | 2 +- layout/html/forms/src/nsFormFrame.h | 3 ++- layout/html/table/src/nsTableColFrame.h | 2 ++ layout/tables/nsTableColFrame.h | 2 ++ layout/xul/base/src/nsBoxFrame.cpp | 1 + layout/xul/base/src/nsProgressMeterFrame.cpp | 1 + layout/xul/base/src/nsTreeCellFrame.cpp | 1 + layout/xul/base/src/nsTreeIndentationFrame.cpp | 1 + 16 files changed, 15 insertions(+), 8 deletions(-) diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp index eb6937b1439..5301adc3d79 100644 --- a/content/base/src/nsGenericDOMDataNode.cpp +++ b/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" diff --git a/layout/base/src/nsGenericDOMDataNode.cpp b/layout/base/src/nsGenericDOMDataNode.cpp index eb6937b1439..5301adc3d79 100644 --- a/layout/base/src/nsGenericDOMDataNode.cpp +++ b/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" diff --git a/layout/generic/nsBlockReflowContext.cpp b/layout/generic/nsBlockReflowContext.cpp index 3f9b01ed595..c88be7a8781 100644 --- a/layout/generic/nsBlockReflowContext.cpp +++ b/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" diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index e0e94b810f2..0deb6d14bac 100644 --- a/layout/generic/nsFrame.h +++ b/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" diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index ba815de68d3..68b4fb39ebf 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/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" diff --git a/layout/html/base/src/nsBlockReflowContext.cpp b/layout/html/base/src/nsBlockReflowContext.cpp index 3f9b01ed595..c88be7a8781 100644 --- a/layout/html/base/src/nsBlockReflowContext.cpp +++ b/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" diff --git a/layout/html/base/src/nsFrame.h b/layout/html/base/src/nsFrame.h index e0e94b810f2..0deb6d14bac 100644 --- a/layout/html/base/src/nsFrame.h +++ b/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" diff --git a/layout/html/base/src/nsTextFrame.cpp b/layout/html/base/src/nsTextFrame.cpp index ba815de68d3..68b4fb39ebf 100644 --- a/layout/html/base/src/nsTextFrame.cpp +++ b/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" diff --git a/layout/html/forms/src/nsFormFrame.cpp b/layout/html/forms/src/nsFormFrame.cpp index 9fe651a0580..e954f620167 100644 --- a/layout/html/forms/src/nsFormFrame.cpp +++ b/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; diff --git a/layout/html/forms/src/nsFormFrame.h b/layout/html/forms/src/nsFormFrame.h index e62549c794d..8d7575fdb13 100644 --- a/layout/html/forms/src/nsFormFrame.h +++ b/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. diff --git a/layout/html/table/src/nsTableColFrame.h b/layout/html/table/src/nsTableColFrame.h index 4841535b6c8..2c736c3d251 100644 --- a/layout/html/table/src/nsTableColFrame.h +++ b/layout/html/table/src/nsTableColFrame.h @@ -21,6 +21,8 @@ #include "nscore.h" #include "nsContainerFrame.h" +class nsVoidArray; + class nsTableColFrame : public nsFrame { public: diff --git a/layout/tables/nsTableColFrame.h b/layout/tables/nsTableColFrame.h index 4841535b6c8..2c736c3d251 100644 --- a/layout/tables/nsTableColFrame.h +++ b/layout/tables/nsTableColFrame.h @@ -21,6 +21,8 @@ #include "nscore.h" #include "nsContainerFrame.h" +class nsVoidArray; + class nsTableColFrame : public nsFrame { public: diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp index 23519890858..4a1049d0b0b 100644 --- a/layout/xul/base/src/nsBoxFrame.cpp +++ b/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" diff --git a/layout/xul/base/src/nsProgressMeterFrame.cpp b/layout/xul/base/src/nsProgressMeterFrame.cpp index 0ac6076d6a8..5e2c9ee3a65 100644 --- a/layout/xul/base/src/nsProgressMeterFrame.cpp +++ b/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" diff --git a/layout/xul/base/src/nsTreeCellFrame.cpp b/layout/xul/base/src/nsTreeCellFrame.cpp index 4c710cb7f32..028e67ca02a 100644 --- a/layout/xul/base/src/nsTreeCellFrame.cpp +++ b/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" diff --git a/layout/xul/base/src/nsTreeIndentationFrame.cpp b/layout/xul/base/src/nsTreeIndentationFrame.cpp index ee604ae3290..2bfbdc4dfa7 100644 --- a/layout/xul/base/src/nsTreeIndentationFrame.cpp +++ b/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"