Bug 1652017 - Remove unnecessary includes for expensive nsIFrame.h. r…

…=emilio Differential Revision: https://phabricator.services.mozilla.com/D83111
iaxat · Jul 15, 2020 · f8a52d2 · f8a52d2
1 parent d7fd3be
commit f8a52d2
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 20 deletions.
diff --git a/accessible/base/SelectionManager.cpp b/accessible/base/SelectionManager.cpp
@@ -203,3 +203,5 @@ void SelectionManager::ProcessSelectionChanged(SelData* aSelData) {
         nsIAccessibleEvent::EVENT_TEXT_ATTRIBUTE_CHANGED, text);
   }
 }
+
+SelectionManager::~SelectionManager() = default;
diff --git a/accessible/base/SelectionManager.h b/accessible/base/SelectionManager.h
@@ -6,7 +6,6 @@
 #ifndef mozilla_a11y_SelectionManager_h__
 #define mozilla_a11y_SelectionManager_h__
 
-#include "nsIFrame.h"
 #include "nsISelectionListener.h"
 #include "mozilla/WeakPtr.h"
 
@@ -107,6 +106,8 @@ class SelectionManager : public nsISelectionListener {
     mAccWithCaret = nullptr;
   }
 
+  ~SelectionManager();
+
  protected:
   SelectionManager();
 

diff --git a/accessible/generic/HyperTextAccessible.h b/accessible/generic/HyperTextAccessible.h
@@ -11,9 +11,9 @@
 #include "nsIAccessibleTypes.h"
 #include "nsDirection.h"
 #include "WordMovementType.h"
-#include "nsIFrame.h"
 
 class nsFrameSelection;
+class nsIFrame;
 class nsRange;
 class nsIWidget;
 

diff --git a/dom/base/nsFrameLoader.h b/dom/base/nsFrameLoader.h
@@ -13,6 +13,7 @@
 #define nsFrameLoader_h_
 
 #include "nsDocShell.h"
+#include "nsIFrame.h"
 #include "nsStringFwd.h"
 #include "nsPoint.h"
 #include "nsSize.h"
@@ -28,7 +29,6 @@
 #include "mozilla/layers/LayersTypes.h"
 #include "nsStubMutationObserver.h"
 #include "Units.h"
-#include "nsIFrame.h"
 #include "nsPluginTags.h"
 
 class nsIURI;

diff --git a/dom/base/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h
@@ -15,12 +15,12 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "nsIFrame.h"  // for WeakFrame only
 #include "nsImageLoadingContent.h"
 #include "nsIStreamListener.h"
 #include "nsIChannelEventSink.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsIRunnable.h"
-#include "nsIFrame.h"
 #include "nsFrameLoaderOwner.h"
 
 class nsAsyncInstantiateEvent;

diff --git a/dom/events/EventStateManager.h b/dom/events/EventStateManager.h
@@ -16,14 +16,14 @@
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/layers/APZUtils.h"
-#include "nsIFrame.h"
 #include "Units.h"
 #include "WheelHandlingHelper.h"  // for WheelDeltaAdjustmentStrategy
 
 class nsFrameLoader;
 class nsIContent;
 class nsIDocShell;
 class nsIDocShellTreeItem;
+class nsIFrame;
 class imgIContainer;
 class nsIContentViewer;
 class nsIScrollableFrame;

diff --git a/dom/events/WheelHandlingHelper.h b/dom/events/WheelHandlingHelper.h
@@ -10,9 +10,10 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 #include "nsCoord.h"
-#include "nsIFrame.h"
+#include "nsIFrame.h"  // for AutoWeakFrame only
 #include "nsPoint.h"
 
+class nsIFrame;
 class nsIScrollableFrame;
 class nsITimer;
 

diff --git a/layout/base/AccessibleCaret.h b/layout/base/AccessibleCaret.h
@@ -12,7 +12,7 @@
 #include "mozilla/dom/Element.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMEventListener.h"
-#include "nsIFrame.h"
+#include "nsIFrame.h"  // for WeakFrame only
 #include "nsISupportsBase.h"
 #include "nsISupportsImpl.h"
 #include "nsLiteralString.h"

diff --git a/layout/base/AccessibleCaretEventHub.h b/layout/base/AccessibleCaretEventHub.h
@@ -13,7 +13,6 @@
 #include "mozilla/WeakPtr.h"
 #include "nsCOMPtr.h"
 #include "nsDocShell.h"
-#include "nsIFrame.h"
 #include "nsIReflowObserver.h"
 #include "nsIScrollObserver.h"
 #include "nsPoint.h"

diff --git a/layout/base/nsGenConList.h b/layout/base/nsGenConList.h
@@ -10,12 +10,12 @@
 #define nsGenConList_h___
 
 #include "mozilla/LinkedList.h"
-#include "nsIFrame.h"
 #include "nsStyleStruct.h"
 #include "nsCSSPseudoElements.h"
 #include "nsTextNode.h"
 
 class nsGenConList;
+class nsIFrame;
 
 struct nsGenConNode : public mozilla::LinkedListElement<nsGenConNode> {
   using StyleContentType = mozilla::StyleContentItem::Tag;

diff --git a/layout/base/nsIFrameTraversal.h b/layout/base/nsIFrameTraversal.h
@@ -7,7 +7,8 @@
 #define NSIFRAMETRAVERSAL_H
 
 #include "nsISupports.h"
-#include "nsIFrame.h"
+
+class nsIFrame;
 
 #define NS_IFRAMEENUMERATOR_IID                      \
   {                                                  \

diff --git a/layout/generic/nsBlockReflowContext.h b/layout/generic/nsBlockReflowContext.h
@@ -9,9 +9,9 @@
 #ifndef nsBlockReflowContext_h___
 #define nsBlockReflowContext_h___
 
-#include "nsIFrame.h"
 #include "mozilla/ReflowOutput.h"
 
+class nsIFrame;
 class nsLineBox;
 class nsPresContext;
 namespace mozilla {

diff --git a/layout/generic/nsHTMLParts.h b/layout/generic/nsHTMLParts.h
@@ -10,8 +10,10 @@
 #define nsHTMLParts_h___
 
 #include "nscore.h"
+#include "nsFrameState.h"
 #include "nsISupports.h"
-#include "nsIFrame.h"
+
+class nsContainerFrame;
 class nsComboboxControlFrame;
 class nsCheckboxRadioFrame;
 class nsAtom;
@@ -25,8 +27,13 @@ class nsIURI;
 class nsIChannel;
 class nsTableColFrame;
 namespace mozilla {
+class ComputedStyle;
 class PresShell;
 class ViewportFrame;
+
+namespace dom {
+class Document;
+}
 }  // namespace mozilla
 
 // Factory methods for creating html layout objects

diff --git a/layout/printing/nsPrintJob.h b/layout/printing/nsPrintJob.h
@@ -14,9 +14,9 @@
 #include "nsPrintObject.h"
 #include "nsPrintData.h"
 #include "nsFrameList.h"
-#include "nsIFrame.h"
 #include "nsIWebProgress.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
+#include "nsIFrame.h"  // for WeakFrame only
 #include "nsIWebProgressListener.h"
 #include "nsWeakReference.h"
 
@@ -27,6 +27,7 @@
 class nsPagePrintTimer;
 class nsIDocShell;
 class nsIDocumentViewerPrint;
+class nsIFrame;
 class nsPrintObject;
 class nsIDocShell;
 class nsPageSequenceFrame;

diff --git a/layout/style/ImageLoader.h b/layout/style/ImageLoader.h
@@ -21,7 +21,6 @@
 #include "mozilla/Attributes.h"
 
 class imgIContainer;
-class nsIFrame;
 class nsPresContext;
 class nsIURI;
 class nsIPrincipal;

diff --git a/layout/svg/FilterInstance.cpp b/layout/svg/FilterInstance.cpp
@@ -29,6 +29,7 @@
 #include "mozilla/SVGUtils.h"
 #include "CSSFilterInstance.h"
 #include "SVGFilterPaintCallback.h"
+#include "SVGIntegrationUtils.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::gfx;

diff --git a/layout/svg/FilterInstance.h b/layout/svg/FilterInstance.h
@@ -17,7 +17,6 @@
 #include "nsRect.h"
 #include "nsSize.h"
 #include "nsTArray.h"
-#include "nsIFrame.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 

diff --git a/layout/svg/SVGFilterFrame.h b/layout/svg/SVGFilterFrame.h
@@ -9,7 +9,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/SVGContainerFrame.h"
-#include "nsIFrame.h"
 #include "nsQueryFrame.h"
 
 class nsAtom;

diff --git a/layout/svg/SVGObserverUtils.h b/layout/svg/SVGObserverUtils.h
@@ -12,16 +12,18 @@
 #include "FrameProperties.h"
 #include "mozilla/dom/Element.h"
 #include "nsID.h"
-#include "nsIFrame.h"
+#include "nsIFrame.h"  // only for LayoutFrameType
 #include "nsIMutationObserver.h"
 #include "nsISupportsBase.h"
 #include "nsISupportsImpl.h"
 #include "nsIReferrerInfo.h"
 #include "nsStringFwd.h"
 #include "nsStubMutationObserver.h"
+#include "nsStyleStruct.h"
 #include "nsCycleCollectionParticipant.h"
 
 class nsAtom;
+class nsIFrame;
 class nsIURI;
 
 namespace mozilla {

diff --git a/layout/svg/SVGUtils.h b/layout/svg/SVGUtils.h
@@ -32,7 +32,6 @@ class gfxContext;
 class nsFrameList;
 class nsIContent;
 
-class nsIFrame;
 class nsPresContext;
 class nsTextFrame;
 

diff --git a/layout/xul/grid/nsGrid.cpp b/layout/xul/grid/nsGrid.cpp
@@ -13,6 +13,7 @@
 
 #include "nsGrid.h"
 #include "nsGridRowGroupLayout.h"
+#include "nsIFrame.h"
 #include "nsIScrollableFrame.h"
 #include "nsSprocketLayout.h"
 #include "nsGridLayout2.h"

diff --git a/layout/xul/nsSprocketLayout.h b/layout/xul/nsSprocketLayout.h
@@ -10,7 +10,10 @@
 #include "mozilla/Attributes.h"
 #include "nsBoxLayout.h"
 #include "nsCOMPtr.h"
-#include "nsIFrame.h"
+#include "nsFrameState.h"
+
+class nsIFrame;
+struct nsRect;
 
 class nsBoxSize {
  public:

diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
@@ -25,7 +25,6 @@
 #include "nsIDragService.h"
 #include "nsGkAtoms.h"
 #include "nsRefPtrHashtable.h"
-#include "nsIFrame.h"
 #include "nsBaseWidget.h"
 #include "CompositorWidget.h"
 #include "mozilla/widget/WindowSurface.h"
@@ -81,6 +80,7 @@ void WindowDragLeaveHandler(GtkWidget* aWidget);
 #endif
 
 class gfxPattern;
+class nsIFrame;
 
 namespace mozilla {
 class TimeStamp;
-Original file line number
+Diff line change
@@ Expand Up @@
             nsIAccessibleEvent::EVENT_TEXT_ATTRIBUTE_CHANGED, text);
       }
     }
+    SelectionManager::~SelectionManager() = default;