Bug 1459498: Use a different enum to differentiate IsAlternate from HasAlternateRel. r=heycam

MozReview-Commit-ID: 6pwR8t6fzSD

dom/base/nsStyleLinkElement.cpp

@@ -44,7 +44,7 @@ nsStyleLinkElement::StyleSheetInfo::StyleSheetInfo(
   mozilla::CORSMode aCORSMode,
   const nsAString& aTitle,
   const nsAString& aMedia,
-  IsAlternate aHasAlternateRel,
+  HasAlternateRel aHasAlternateRel,
   IsInline aIsInline
 )
   : mURI(aURI)
@@ -53,7 +53,7 @@ nsStyleLinkElement::StyleSheetInfo::StyleSheetInfo(
   , mCORSMode(aCORSMode)
   , mTitle(aTitle)
   , mMedia(aMedia)
-  , mHasAlternateRel(aHasAlternateRel == IsAlternate::Yes)
+  , mHasAlternateRel(aHasAlternateRel == HasAlternateRel::Yes)
   , mIsInline(aIsInline == IsInline::Yes)
 {
   MOZ_ASSERT(!mIsInline || aContent);

dom/base/nsStyleLinkElement.h

@@ -41,6 +41,11 @@ protected:
     No
   };
 
+  enum class HasAlternateRel
+  {
+    Yes,
+    No
+  };
 
   struct MOZ_STACK_CLASS StyleSheetInfo
   {
@@ -54,6 +59,7 @@ protected:
     nsAutoString mMedia;
     nsAutoString mIntegrity;
 
+    bool mIsAlternate : 1;
     bool mHasAlternateRel : 1;
     bool mIsInline : 1;
 
@@ -65,7 +71,7 @@ protected:
                    mozilla::CORSMode aCORSMode,
                    const nsAString& aTitle,
                    const nsAString& aMedia,
-                   IsAlternate aHasAlternateRel,
+                   HasAlternateRel aHasAlternateRel,
                    IsInline aIsInline);
 
     ~StyleSheetInfo();

dom/html/HTMLLinkElement.cpp

@@ -475,7 +475,7 @@ HTMLLinkElement::GetStyleSheetInfo()
     GetCORSMode(),
     title,
     media,
-    alternate ? IsAlternate::Yes : IsAlternate::No,
+    alternate ? HasAlternateRel::Yes : HasAlternateRel::No,
     IsInline::No,
   });
 }

dom/html/HTMLStyleElement.cpp

@@ -228,7 +228,7 @@ HTMLStyleElement::GetStyleSheetInfo()
     CORS_NONE,
     title,
     media,
-    IsAlternate::No,
+    HasAlternateRel::No,
     IsInline::Yes,
   });
 }

dom/svg/SVGStyleElement.cpp

@@ -245,7 +245,7 @@ SVGStyleElement::GetStyleSheetInfo()
     AttrValueToCORSMode(GetParsedAttr(nsGkAtoms::crossorigin)),
     title,
     media,
-    IsAlternate::No,
+    HasAlternateRel::No,
     IsInline::Yes,
   });
 }

dom/xml/XMLStylesheetProcessingInstruction.cpp

@@ -159,7 +159,7 @@ XMLStylesheetProcessingInstruction::GetStyleSheetInfo()
     CORS_NONE,
     title,
     media,
-    alternate ? IsAlternate::Yes : IsAlternate::No,
+    alternate ? HasAlternateRel::Yes : HasAlternateRel::No,
     IsInline::No,
   });
 }