Bug 1602421 - Remove some useless includes. r=jfkthame

Differential Revision: https://phabricator.services.mozilla.com/D56350

--HG--
extra : moz-landing-system : lando

dom/html/HTMLSpanElement.h

@@ -7,11 +7,7 @@
 #ifndef mozilla_dom_HTMLSpanElement_h
 #define mozilla_dom_HTMLSpanElement_h
 
-#include "mozilla/Attributes.h"
 #include "nsGenericHTMLElement.h"
-#include "nsGkAtoms.h"
-#include "nsStyleConsts.h"
-#include "nsAtom.h"
 
 namespace mozilla {
 namespace dom {

gfx/layers/FrameMetrics.cpp

@@ -86,6 +86,22 @@ void FrameMetrics::KeepLayoutViewportEnclosingVisualViewport(
   aLayoutViewport = aLayoutViewport.MoveInsideAndClamp(aScrollableRect);
 }
 
+ScrollSnapInfo::ScrollSnapInfo()
+    : mScrollSnapStrictnessX(StyleScrollSnapStrictness::None),
+      mScrollSnapStrictnessY(StyleScrollSnapStrictness::None) {}
+
+bool ScrollSnapInfo::HasScrollSnapping() const {
+  return mScrollSnapStrictnessY != StyleScrollSnapStrictness::None ||
+         mScrollSnapStrictnessX != StyleScrollSnapStrictness::None;
+}
+
+bool ScrollSnapInfo::HasSnapPositions() const {
+  return (!mSnapPositionX.IsEmpty() &&
+          mScrollSnapStrictnessX != StyleScrollSnapStrictness::None) ||
+         (!mSnapPositionY.IsEmpty() &&
+          mScrollSnapStrictnessY != StyleScrollSnapStrictness::None);
+}
+
 void ScrollSnapInfo::InitializeScrollSnapStrictness(
     WritingMode aWritingMode, const nsStyleDisplay* aDisplay) {
   if (aDisplay->mScrollSnapType.strictness == StyleScrollSnapStrictness::None) {

gfx/layers/FrameMetrics.h

@@ -22,11 +22,12 @@
 #include "mozilla/TimeStamp.h"                   // for TimeStamp
 #include "nsDataHashtable.h"                     // for nsDataHashtable
 #include "nsString.h"
-#include "mozilla/ServoStyleConsts.h"
 #include "PLDHashTable.h"  // for PLDHashNumber
 
 struct nsStyleDisplay;
 namespace mozilla {
+enum class StyleScrollSnapStrictness : uint8_t;
+enum class StyleOverscrollBehavior : uint8_t;
 class WritingMode;
 }  // namespace mozilla
 
@@ -728,7 +729,7 @@ struct FrameMetrics {
 };
 
 struct ScrollSnapInfo {
-  ScrollSnapInfo() = default;
+  ScrollSnapInfo();
 
   bool operator==(const ScrollSnapInfo& aOther) const {
     return mScrollSnapStrictnessX == aOther.mScrollSnapStrictnessX &&
@@ -740,27 +741,15 @@ struct ScrollSnapInfo {
            mSnapportSize == aOther.mSnapportSize;
   }
 
-  bool HasScrollSnapping() const {
-    return mScrollSnapStrictnessY != mozilla::StyleScrollSnapStrictness::None ||
-           mScrollSnapStrictnessX != mozilla::StyleScrollSnapStrictness::None;
-  }
-
-  bool HasSnapPositions() const {
-    return (!mSnapPositionX.IsEmpty() &&
-            mScrollSnapStrictnessX !=
-                mozilla::StyleScrollSnapStrictness::None) ||
-           (!mSnapPositionY.IsEmpty() &&
-            mScrollSnapStrictnessY != mozilla::StyleScrollSnapStrictness::None);
-  }
+  bool HasScrollSnapping() const;
+  bool HasSnapPositions() const;
 
   void InitializeScrollSnapStrictness(WritingMode aWritingMode,
                                       const nsStyleDisplay* aDisplay);
 
   // The scroll frame's scroll-snap-type.
-  mozilla::StyleScrollSnapStrictness mScrollSnapStrictnessX =
-      mozilla::StyleScrollSnapStrictness::None;
-  mozilla::StyleScrollSnapStrictness mScrollSnapStrictnessY =
-      mozilla::StyleScrollSnapStrictness::None;
+  StyleScrollSnapStrictness mScrollSnapStrictnessX;
+  StyleScrollSnapStrictness mScrollSnapStrictnessY;
 
   // The scroll positions corresponding to scroll-snap-align values.
   nsTArray<nscoord> mSnapPositionX;

gfx/thebes/gfxPlatform.h

@@ -15,7 +15,6 @@
 #include "nsUnicodeScriptCodes.h"
 
 #include "gfxTypes.h"
-#include "gfxFontFamilyList.h"
 #include "gfxBlur.h"
 #include "gfxSkipChars.h"
 #include "nsRect.h"
@@ -44,6 +43,7 @@ class gfxTextPerfMetrics;
 typedef struct FT_LibraryRec_* FT_Library;
 
 namespace mozilla {
+class FontFamilyList;
 namespace layers {
 class FrameStats;
 }

layout/base/nsLayoutUtils.h

@@ -15,12 +15,10 @@
 #include "mozilla/StaticPrefs_nglayout.h"
 #include "mozilla/TypedEnumBits.h"
 #include "nsBoundingMetrics.h"
-#include "nsChangeHint.h"
 #include "mozilla/layout/FrameChildList.h"
 #include "mozilla/layers/ScrollableLayerGuid.h"
 #include "nsThreadUtils.h"
 #include "nsCSSPropertyIDSet.h"
-#include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
 #include "mozilla/gfx/2D.h"
 #include "Units.h"
@@ -47,6 +45,7 @@ class nsIScrollableFrame;
 class nsRegion;
 class nsDisplayListBuilder;
 enum class nsDisplayListBuilderMode : uint8_t;
+enum nsChangeHint : uint32_t;
 class nsDisplayItem;
 class nsFontMetrics;
 class nsFontFaceList;

layout/painting/DisplayItemClip.h

@@ -10,7 +10,6 @@
 #include "mozilla/RefPtr.h"
 #include "nsRect.h"
 #include "nsTArray.h"
-#include "nsStyleConsts.h"
 
 class gfxContext;
 class nsPresContext;

layout/painting/nsCSSRenderingBorders.h

@@ -17,15 +17,16 @@
 #include "nsCOMPtr.h"
 #include "nsIFrame.h"
 #include "nsImageRenderer.h"
-#include "nsStyleConsts.h"
-#include "nsStyleStruct.h"
-#include "nsPresContext.h"
 #include "gfxUtils.h"
 
 struct nsBorderColors;
 class nsDisplayBorder;
 
 namespace mozilla {
+
+enum class StyleBorderStyle : uint8_t;
+enum class StyleBorderImageRepeat : uint8_t;
+
 namespace gfx {
 class GradientStops;
 }  // namespace gfx

layout/style/nsCSSValue.h

@@ -18,16 +18,8 @@
 #include "mozilla/URLExtraData.h"
 #include "mozilla/UniquePtr.h"
 
-#include "nsCSSKeywords.h"
-#include "nsCSSPropertyID.h"
 #include "nsCoord.h"
-#include "nsProxyRelease.h"
-#include "nsRefPtrHashtable.h"
-#include "nsString.h"
-#include "nsStringBuffer.h"
 #include "nsTArray.h"
-#include "nsStyleConsts.h"
-#include "gfxFontFamilyList.h"
 
 #include <type_traits>
 
@@ -172,11 +164,6 @@ class nsCSSValue {
     return mValue.mInt;
   }
 
-  nsCSSKeyword GetKeywordValue() const {
-    MOZ_ASSERT(mUnit == eCSSUnit_Enumerated, "not a keyword value");
-    return static_cast<nsCSSKeyword>(mValue.mInt);
-  }
-
   float GetPercentValue() const {
     MOZ_ASSERT(mUnit == eCSSUnit_Percent, "not a percent value");
     return mValue.mFloat;

layout/style/nsStyleUtil.h

@@ -9,10 +9,10 @@
 #include "nsCoord.h"
 #include "nsCSSPropertyID.h"
 #include "nsTArrayForwardDeclare.h"
-#include "gfxFontFamilyList.h"
 #include "nsStringFwd.h"
-#include "nsStyleStruct.h"
 #include "nsCRT.h"
+#include "nsColor.h"
+#include "nsGkAtoms.h"
 
 class nsCSSValue;
 class nsIContent;
@@ -21,6 +21,7 @@ class nsIURI;
 struct gfxFontFeature;
 struct nsCSSKTableEntry;
 struct nsCSSValueList;
+struct nsStylePosition;
 
 namespace mozilla {
 class FontSlantStyle;

layout/svg/SVGContextPaint.h

@@ -19,6 +19,7 @@
 #include "nsStyleStruct.h"
 #include "nsTArray.h"
 #include "ImgDrawResult.h"
+#include "nsRefPtrHashtable.h"
 
 class gfxContext;