Backed out 13 changesets (bug 1640839) for causing bustage on Element.cpp CLOSED TREE

Backed out changeset 179ceb82c9e5 (bug 1640839)
Backed out changeset 73f498a821f0 (bug 1640839)
Backed out changeset dc2d3d0e0365 (bug 1640839)
Backed out changeset ddc989ac0509 (bug 1640839)
Backed out changeset e595bb3feea8 (bug 1640839)
Backed out changeset c85aca04e27f (bug 1640839)
Backed out changeset 98e8e3a4047a (bug 1640839)
Backed out changeset 59ef180517db (bug 1640839)
Backed out changeset af2f5e293662 (bug 1640839)
Backed out changeset 89aa6d9dc598 (bug 1640839)
Backed out changeset 67b722a722f9 (bug 1640839)
Backed out changeset 24a9665c6ced (bug 1640839)
Backed out changeset d93f199385e9 (bug 1640839)

Author: ncsoregi

docshell/base/BrowsingContext.cpp

@@ -20,7 +20,6 @@
 #endif
 #include "mozilla/AppShutdown.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
-#include "mozilla/dom/BindingIPCUtils.h"
 #include "mozilla/dom/BrowserHost.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowserParent.h"
@@ -97,17 +96,23 @@ namespace IPC {
 // Allow serialization and deserialization of OrientationType over IPC
 template <>
 struct ParamTraits<mozilla::dom::OrientationType>
-    : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::OrientationType> {
-};
+    : public ContiguousEnumSerializer<
+          mozilla::dom::OrientationType,
+          mozilla::dom::OrientationType::Portrait_primary,
+          mozilla::dom::OrientationType::EndGuard_> {};
 
 template <>
 struct ParamTraits<mozilla::dom::DisplayMode>
-    : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::DisplayMode> {};
+    : public ContiguousEnumSerializer<mozilla::dom::DisplayMode,
+                                      mozilla::dom::DisplayMode::Browser,
+                                      mozilla::dom::DisplayMode::EndGuard_> {};
 
 template <>
 struct ParamTraits<mozilla::dom::PrefersColorSchemeOverride>
-    : public mozilla::dom::WebIDLEnumSerializer<
-          mozilla::dom::PrefersColorSchemeOverride> {};
+    : public ContiguousEnumSerializer<
+          mozilla::dom::PrefersColorSchemeOverride,
+          mozilla::dom::PrefersColorSchemeOverride::None,
+          mozilla::dom::PrefersColorSchemeOverride::EndGuard_> {};
 
 template <>
 struct ParamTraits<mozilla::dom::ExplicitActiveStatus>
@@ -119,8 +124,10 @@ struct ParamTraits<mozilla::dom::ExplicitActiveStatus>
 // Allow serialization and deserialization of TouchEventsOverride over IPC
 template <>
 struct ParamTraits<mozilla::dom::TouchEventsOverride>
-    : public mozilla::dom::WebIDLEnumSerializer<
-          mozilla::dom::TouchEventsOverride> {};
+    : public ContiguousEnumSerializer<
+          mozilla::dom::TouchEventsOverride,
+          mozilla::dom::TouchEventsOverride::Disabled,
+          mozilla::dom::TouchEventsOverride::EndGuard_> {};
 
 template <>
 struct ParamTraits<mozilla::dom::EmbedderColorSchemes> {

docshell/shistory/SessionHistoryEntry.cpp

@@ -20,7 +20,7 @@
 #include "nsXULAppAPI.h"
 #include "mozilla/PresState.h"
 #include "mozilla/StaticPrefs_fission.h"
-#include "mozilla/dom/BindingIPCUtils.h"
+
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/dom/ContentChild.h"
@@ -1797,8 +1797,10 @@ namespace IPC {
 // Allow sending mozilla::dom::WireframeRectType enums over IPC.
 template <>
 struct ParamTraits<mozilla::dom::WireframeRectType>
-    : public mozilla::dom::WebIDLEnumSerializer<
-          mozilla::dom::WireframeRectType> {};
+    : public ContiguousEnumSerializer<
+          mozilla::dom::WireframeRectType,
+          mozilla::dom::WireframeRectType::Image,
+          mozilla::dom::WireframeRectType::EndGuard_> {};
 
 template <>
 struct ParamTraits<mozilla::dom::WireframeTaggedRect> {

dom/animation/EffectCompositor.h

@@ -244,8 +244,8 @@ class EffectCompositor {
   // animations that can be throttled, we will add an entry to the hashtable to
   // indicate that the style rule on the element is out of date but without
   // posting a restyle to update it.
-  EnumeratedArray<CascadeLevel, nsTHashMap<PseudoElementHashEntry, bool>,
-                  kCascadeLevelCount>
+  EnumeratedArray<CascadeLevel, CascadeLevel(kCascadeLevelCount),
+                  nsTHashMap<PseudoElementHashEntry, bool>>
       mElementsToRestyle;
 
   bool mIsInPreTraverse = false;

dom/base/ChromeUtils.cpp

@@ -1368,8 +1368,7 @@ void ChromeUtils::ClearStyleSheetCache(GlobalObject&) {
 static WebIDLProcType ProcTypeToWebIDL(mozilla::ProcType aType) {
   // Max is the value of the last enum, not the length, so add one.
   static_assert(
-      static_cast<size_t>(MaxContiguousEnumValue<WebIDLProcType>::value) ==
-          static_cast<size_t>(ProcType::Max),
+      WebIDLProcTypeValues::Count == static_cast<size_t>(ProcType::Max) + 1,
       "In order for this static cast to be okay, "
       "WebIDLProcType must match ProcType exactly");
 
@@ -2076,9 +2075,9 @@ unsigned ChromeUtils::AliveUtilityProcesses(const GlobalObject&) {
 void ChromeUtils::GetAllPossibleUtilityActorNames(GlobalObject& aGlobal,
                                                   nsTArray<nsCString>& aNames) {
   aNames.Clear();
-  for (UtilityActorName idlName :
-       MakeWebIDLEnumeratedRange<WebIDLUtilityActorName>()) {
-    aNames.AppendElement(GetEnumString(idlName));
+  for (size_t i = 0; i < WebIDLUtilityActorNameValues::Count; ++i) {
+    auto idlName = static_cast<UtilityActorName>(i);
+    aNames.AppendElement(WebIDLUtilityActorNameValues::GetString(idlName));
   }
 }
 

dom/base/DOMParser.cpp

@@ -181,10 +181,12 @@ already_AddRefed<Document> DOMParser::ParseFromStream(nsIInputStream* aStream,
 
   // Create a fake channel
   nsCOMPtr<nsIChannel> parserChannel;
-  NS_NewInputStreamChannel(getter_AddRefs(parserChannel), mDocumentURI,
-                           nullptr,  // aStream
-                           mPrincipal, nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
-                           nsIContentPolicy::TYPE_OTHER, GetEnumString(aType));
+  NS_NewInputStreamChannel(
+      getter_AddRefs(parserChannel), mDocumentURI,
+      nullptr,  // aStream
+      mPrincipal, nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
+      nsIContentPolicy::TYPE_OTHER,
+      nsDependentCSubstring(SupportedTypeValues::GetString(aType)));
   if (NS_WARN_IF(!parserChannel)) {
     aRv.Throw(NS_ERROR_UNEXPECTED);
     return nullptr;

dom/base/Element.cpp

@@ -781,9 +781,12 @@ void Element::ScrollIntoView(const ScrollIntoViewOptions& aOptions) {
         return WhereToScroll::Center;
       case ScrollLogicalPosition::End:
         return WhereToScroll::End;
+      case ScrollLogicalPosition::EndGuard_:
+        MOZ_FALLTHROUGH_ASSERT("Unexpected block direction value");
       case ScrollLogicalPosition::Nearest:
-        return WhereToScroll::Nearest;
+        break;
     }
+    return WhereToScroll::Nearest;
   };
 
   const auto block = ToWhereToScroll(aOptions.mBlock);

dom/base/FlushType.h

@@ -40,7 +40,7 @@ enum class FlushType : uint8_t {
 
 // Flush type strings that will be displayed in the profiler
 // clang-format off
-const EnumeratedArray<FlushType, const char*, size_t(FlushType::Count)>
+const EnumeratedArray<FlushType, FlushType::Count, const char*>
     kFlushTypeNames = {
   "",
   "Event",

dom/bindings/BindingDeclarations.h

@@ -131,6 +131,11 @@ template <class T>
 constexpr bool is_dom_union_with_typedarray_members =
     std::is_base_of_v<UnionWithTypedArraysBase, T>;
 
+struct EnumEntry {
+  const char* value;
+  size_t length;
+};
+
 enum class CallerType : uint32_t;
 
 class MOZ_STACK_CLASS GlobalObject {
@@ -557,13 +562,6 @@ JS::Handle<JSObject*> GetPerInterfaceObjectHandle(
     JSContext* aCx, size_t aSlotId, CreateInterfaceObjectsMethod aCreator,
     bool aDefineOnGlobal);
 
-namespace binding_detail {
-
-template <typename Enum>
-struct EnumStrings;
-
-}  // namespace binding_detail
-
 }  // namespace dom
 }  // namespace mozilla
 

dom/bindings/BindingIPCUtils.h

@@ -6,18 +6,9 @@
 #ifndef _mozilla_dom_BindingIPCUtils_h
 #define _mozilla_dom_BindingIPCUtils_h
 
-#include "mozilla/EnumTypeTraits.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "ipc/EnumSerializer.h"
 
-namespace mozilla::dom {
-
-template <class Enum>
-using WebIDLEnumSerializer = IPC::ContiguousEnumSerializerInclusive<
-    Enum, ContiguousEnumValues<Enum>::min, ContiguousEnumValues<Enum>::max>;
-
-}  // namespace mozilla::dom
-
 namespace IPC {
 template <>
 struct ParamTraits<mozilla::dom::CallerType>

dom/bindings/BindingUtils.h

@@ -24,8 +24,6 @@
 #include "mozilla/Array.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/DeferredFinalize.h"
-#include "mozilla/EnumTypeTraits.h"
-#include "mozilla/EnumeratedRange.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/BindingCallContext.h"
 #include "mozilla/dom/BindingDeclarations.h"
@@ -1345,27 +1343,26 @@ inline bool EnumValueNotFound<true>(BindingCallContext& cx,
                                                       deflated.get(), type);
 }
 
-namespace binding_detail {
-
 template <typename CharT>
 inline int FindEnumStringIndexImpl(const CharT* chars, size_t length,
-                                   const Span<const nsLiteralCString>& values) {
-  for (size_t i = 0; i < values.Length(); ++i) {
-    const nsLiteralCString& value = values[i];
-    if (length != value.Length()) {
+                                   const EnumEntry* values) {
+  int i = 0;
+  for (const EnumEntry* value = values; value->value; ++value, ++i) {
+    if (length != value->length) {
       continue;
     }
 
     bool equal = true;
+    const char* val = value->value;
     for (size_t j = 0; j != length; ++j) {
-      if (unsigned(value.CharAt(j)) != unsigned(chars[j])) {
+      if (unsigned(val[j]) != unsigned(chars[j])) {
         equal = false;
         break;
       }
     }
 
     if (equal) {
-      return (int)i;
+      return i;
     }
   }
 
@@ -1374,9 +1371,8 @@ inline int FindEnumStringIndexImpl(const CharT* chars, size_t length,
 
 template <bool InvalidValueFatal>
 inline bool FindEnumStringIndex(BindingCallContext& cx, JS::Handle<JS::Value> v,
-                                const Span<const nsLiteralCString>& values,
-                                const char* type, const char* sourceDescription,
-                                int* index) {
+                                const EnumEntry* values, const char* type,
+                                const char* sourceDescription, int* index) {
   // JS_StringEqualsAscii is slow as molasses, so don't use it here.
   JS::Rooted<JSString*> str(cx, JS::ToString(cx, v));
   if (!str) {
@@ -1409,31 +1405,6 @@ inline bool FindEnumStringIndex(BindingCallContext& cx, JS::Handle<JS::Value> v,
   return EnumValueNotFound<InvalidValueFatal>(cx, str, type, sourceDescription);
 }
 
-}  // namespace binding_detail
-
-template <typename Enum, class StringT>
-inline Maybe<Enum> StringToEnum(const StringT& aString) {
-  int index = binding_detail::FindEnumStringIndexImpl(
-      aString.BeginReading(), aString.Length(),
-      binding_detail::EnumStrings<Enum>::Values);
-  return index >= 0 ? Some(static_cast<Enum>(index)) : Nothing();
-}
-
-template <typename Enum>
-inline const nsCString& GetEnumString(Enum stringId) {
-  MOZ_RELEASE_ASSERT(
-      static_cast<size_t>(stringId) <
-      mozilla::ArrayLength(binding_detail::EnumStrings<Enum>::Values));
-  return binding_detail::EnumStrings<Enum>::Values[static_cast<size_t>(
-      stringId)];
-}
-
-template <typename Enum>
-constexpr mozilla::detail::EnumeratedRange<Enum> MakeWebIDLEnumeratedRange() {
-  return MakeInclusiveEnumeratedRange(ContiguousEnumValues<Enum>::min,
-                                      ContiguousEnumValues<Enum>::max);
-}
-
 inline nsWrapperCache* GetWrapperCache(const ParentObject& aParentObject) {
   return aParentObject.mWrapperCache;
 }
@@ -3284,7 +3255,6 @@ already_AddRefed<Promise> CreateRejectedPromiseFromThrownException(
 }  // namespace binding_detail
 
 }  // namespace dom
-
 }  // namespace mozilla
 
 #endif /* mozilla_dom_BindingUtils_h__ */