Revert "Bug 1720570: apply code formatting via Lando" for causing Hazard failures.

This reverts commit 8267f4a.

Revert "Bug 1720570 - Update web-platform test expectations; r=layout-reviewers,emilio"

This reverts commit 0a8f6fa.

Revert "Bug 1720570 - Use backgroundImage in relative-urls.html; r=layout-reviewers,emilio"

This reverts commit 886bec5.

Revert "Bug 1720570 - Support fetching css module scripts; r=dom-core,smaug"

This reverts commit 161decf.

Revert "Bug 1720570 - Add support for css modules in ModuleLoader, WorkerModuleLoader and WorkletModuleLoader; r=allstarschh,dom-core,emilio,smaug"

This reverts commit 1c0eba5.

Revert "Bug 1720570 - Break out separate method to create constructed stylesheets; r=layout-reviewers,firefox-style-system-reviewers,emilio"

This reverts commit 0552b0f.

Revert "Bug 1720570 - Move ModuleTypeAllowed check into ModuleLoaderBase; r=allstarschh"

This reverts commit b3be3d8.

Revert "Bug 1720570 - Handle css module in GetModuleType; r=allstarschh"

This reverts commit 6ff53c0.

Revert "Bug 1720570 - Add CreateCssModule; r=allstarschh"

This reverts commit cf4c677.

Revert "Bug 1720570 - Add ModuleType::CSS; r=allstarschh"

This reverts commit e5f6251.

Revert "Bug 1720570 - Add pref for css module scripts; r=layout-reviewers,emilio"

This reverts commit 9155521.

Author: Atila Butkovits

dom/base/nsContentUtils.cpp

@@ -8659,11 +8659,6 @@ bool nsContentUtils::IsJsonMimeType(const nsAString& aMimeType) {
   return StringEndsWith(subtype, u"+json"_ns);
 }
 
-// https://html.spec.whatwg.org/#fetch-a-single-module-script, 7.3
-bool nsContentUtils::IsCssMimeType(const nsAString& aMimeType) {
-  return aMimeType.LowerCaseEqualsLiteral("text/css");
-}
-
 bool nsContentUtils::PrefetchPreloadEnabled(nsIDocShell* aDocShell) {
   //
   // SECURITY CHECK: disable prefetching and preloading from mailnews!

dom/base/nsContentUtils.h

@@ -2740,12 +2740,6 @@ class nsContentUtils {
    */
   static bool IsJsonMimeType(const nsAString& aMimeType);
 
-  /**
-   * Returns true if the given MIME type string is a valid CSS MIME type,
-   * otherwise false.
-   */
-  static bool IsCssMimeType(const nsAString& aMimeType);
-
   static void SplitMimeType(const nsAString& aValue, nsString& aType,
                             nsString& aParams);
 

dom/script/ModuleLoader.cpp

@@ -26,8 +26,6 @@
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/StyleSheet.h"
-#include "mozilla/StyleSheetInlines.h"
 #include "mozilla/dom/AutoEntryScript.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
@@ -221,10 +219,9 @@ nsresult ModuleLoader::CompileFetchedModule(
       MOZ_CRASH("Unexpected module type");
     case JS::ModuleType::JavaScript:
       return CompileJavaScriptModule(aCx, aOptions, aRequest, aModuleOut);
-    case JS::ModuleType::JSON:
+    case JS::ModuleType::JSON: {
       return CompileJsonModule(aCx, aOptions, aRequest, aModuleOut);
-    case JS::ModuleType::CSS:
-      return CompileCssModule(aCx, aOptions, aRequest, aModuleOut);
+    }
   }
 
   MOZ_CRASH("Unhandled module type");
@@ -356,89 +353,6 @@ nsresult ModuleLoader::CompileJsonModule(
   return NS_OK;
 }
 
-nsresult ModuleLoader::CompileCssModule(
-    JSContext* aCx, JS::CompileOptions& aOptions, ModuleLoadRequest* aRequest,
-    JS::MutableHandle<JSObject*> aModuleOut) {
-  MOZ_ASSERT(!aRequest->GetScriptLoadContext()->mWasCompiledOMT);
-  MOZ_ASSERT(mozilla::StaticPrefs::layout_css_module_scripts_enabled());
-
-  MOZ_ASSERT(aRequest->IsTextSource());
-  ModuleLoader::MaybeSourceText maybeSource;
-  nsresult rv = aRequest->GetScriptSource(aCx, &maybeSource,
-                                          aRequest->mLoadContext.get());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // https://html.spec.whatwg.org/#creating-a-css-module-script
-  ErrorResult error;
-  auto compile = [&](auto& source) -> JSObject* {
-    using T = decltype(source);
-    static_assert(std::is_same_v<T, JS::SourceText<char16_t>&> ||
-                  std::is_same_v<T, JS::SourceText<Utf8Unit>&>);
-
-    nsCOMPtr<nsPIDOMWindowInner> window =
-        do_QueryInterface(aRequest->GetGlobalObject());
-    if (!window) {
-      error.ThrowNotSupportedError("Not supported when there is no document");
-      return nullptr;
-    }
-
-    Document* constructorDocument = window->GetExtantDoc();
-    if (!constructorDocument) {
-      error.ThrowNotSupportedError("Not supported when there is no document");
-      return nullptr;
-    }
-
-    // 5. Let sheet be the result of running the steps to create a constructed
-    // CSSStyleSheet
-    //    with an empty dictionary as the argument.
-    // Note that according to the specification, the baseURL should be the
-    // baseURL of the document, but that doesn't seem correct (see
-    // https://github.com/whatwg/html/issues/11629).
-    dom::CSSStyleSheetInit options;
-    RefPtr<StyleSheet> sheet = StyleSheet::CreateConstructedSheet(
-        *constructorDocument, aRequest->mBaseURL, options, error);
-    if (error.Failed()) {
-      return nullptr;
-    }
-
-    // 6. Run the steps to synchronously replace the rules of a CSSStyleSheet on
-    // sheet given source. Ideally we wouldn't run this on the main thread for
-    // large scripts, see https://bugzilla.mozilla.org/show_bug.cgi?id=1987143.
-    if constexpr (std::is_same_v<T, JS::SourceText<mozilla::Utf8Unit>&>) {
-      nsDependentCSubstring text(source.get(), source.length());
-      sheet->ReplaceSync(text, error);
-    } else if constexpr (std::is_same_v<T, JS::SourceText<char16_t>&>) {
-      nsDependentSubstring text(source.get(), source.length());
-      sheet->ReplaceSync(NS_ConvertUTF16toUTF8(text), error);
-    }
-    if (error.Failed()) {
-      return nullptr;
-    }
-
-    JS::Rooted<JS::Value> val(aCx, JS::NullValue());
-    if (!GetOrCreateDOMReflector(aCx, sheet, &val) || !val.isObject()) {
-      if (!JS_IsExceptionPending(aCx)) {
-        error.ThrowUnknownError("Internal error");
-      }
-      return nullptr;
-    }
-
-    // Steps. 1 - 4 (re-ordered), 7, 8
-    return JS::CreateCssModule(aCx, aOptions, val);
-  };
-
-  auto* cssModule = maybeSource.mapNonEmpty(compile);
-  if (!cssModule) {
-    if (error.Failed()) {
-      MOZ_ALWAYS_TRUE(error.MaybeSetPendingException(aCx));
-    }
-    return NS_ERROR_FAILURE;
-  }
-
-  aModuleOut.set(cssModule);
-  return NS_OK;
-}
-
 already_AddRefed<ModuleLoadRequest> ModuleLoader::CreateTopLevel(
     nsIURI* aURI, nsIScriptElement* aElement, ReferrerPolicy aReferrerPolicy,
     ScriptFetchOptions* aFetchOptions, const SRIMetadata& aIntegrity,

dom/script/ModuleLoader.h

@@ -92,9 +92,6 @@ class ModuleLoader final : public JS::loader::ModuleLoaderBase {
   nsresult CompileJsonModule(JSContext* aCx, JS::CompileOptions& aOptions,
                              ModuleLoadRequest* aRequest,
                              JS::MutableHandle<JSObject*> aModuleOut);
-  nsresult CompileCssModule(JSContext* aCx, JS::CompileOptions& aOptions,
-                            ModuleLoadRequest* aRequest,
-                            JS::MutableHandle<JSObject*> aModuleOut);
 
  private:
   const Kind mKind;

dom/script/ScriptLoader.cpp

@@ -430,32 +430,20 @@ nsContentPolicyType ScriptLoadRequestToContentPolicyType(
     ScriptLoadRequest* aRequest) {
   if (aRequest->GetScriptLoadContext()->IsPreload()) {
     if (aRequest->IsModuleRequest()) {
-      switch (aRequest->AsModuleRequest()->mModuleType) {
-        case JS::ModuleType::JavaScript:
-          return nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD;
-        case JS::ModuleType::JSON:
-          return nsIContentPolicy::TYPE_INTERNAL_JSON_PRELOAD;
-        case JS::ModuleType::CSS:
-          return nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD;
-        case JS::ModuleType::Unknown:
-          MOZ_ASSERT_UNREACHABLE("Unknown module type");
-      }
+      return aRequest->AsModuleRequest()->mModuleType ==
+                     JS::ModuleType::JavaScript
+                 ? nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD
+                 : nsIContentPolicy::TYPE_INTERNAL_JSON_PRELOAD;
     }
 
     return nsIContentPolicy::TYPE_INTERNAL_SCRIPT_PRELOAD;
   }
 
   if (aRequest->IsModuleRequest()) {
-    switch (aRequest->AsModuleRequest()->mModuleType) {
-      case JS::ModuleType::Unknown:
-        MOZ_CRASH("Unexpected module type");
-      case JS::ModuleType::JavaScript:
-        return nsIContentPolicy::TYPE_INTERNAL_MODULE;
-      case JS::ModuleType::JSON:
-        return nsIContentPolicy::TYPE_JSON;
-      case JS::ModuleType::CSS:
-        return nsIContentPolicy::TYPE_STYLESHEET;
-    }
+    return aRequest->AsModuleRequest()->mModuleType ==
+                   JS::ModuleType::JavaScript
+               ? nsIContentPolicy::TYPE_INTERNAL_MODULE
+               : nsIContentPolicy::TYPE_JSON;
   }
 
   return nsIContentPolicy::TYPE_INTERNAL_SCRIPT;
@@ -1975,12 +1963,10 @@ nsresult ScriptLoader::AttemptOffThreadScriptCompile(
     return NS_OK;
   }
 
-  // Don't off-thread compile JSON or CSS modules.
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1912112 (JSON)
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1987143 (CSS)
+  // Don't off-thread compile JSON modules.
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1912112
   if (aRequest->IsModuleRequest() &&
-      (aRequest->AsModuleRequest()->mModuleType == JS::ModuleType::JSON ||
-       aRequest->AsModuleRequest()->mModuleType == JS::ModuleType::CSS)) {
+      aRequest->AsModuleRequest()->mModuleType == JS::ModuleType::JSON) {
     return NS_OK;
   }
 
@@ -4433,11 +4419,6 @@ static bool MimeTypeMatchesExpectedModuleType(
     return true;
   }
 
-  if (expectedModuleType == JS::ModuleType::CSS &&
-      nsContentUtils::IsCssMimeType(typeString)) {
-    return true;
-  }
-
   return false;
 }
 

dom/workers/loader/WorkerModuleLoader.cpp

@@ -151,8 +151,6 @@ nsresult WorkerModuleLoader::CompileFetchedModule(
       return CompileJavaScriptModule(aCx, aOptions, aRequest, aModuleScript);
     case JS::ModuleType::JSON:
       return CompileJsonModule(aCx, aOptions, aRequest, aModuleScript);
-    case JS::ModuleType::CSS:
-      MOZ_CRASH("CSS modules are not supported in workers");
   }
 
   MOZ_CRASH("Unhandled module type");

dom/workers/loader/WorkerModuleLoader.h

@@ -91,14 +91,6 @@ class WorkerModuleLoader : public JS::loader::ModuleLoaderBase {
   void OnModuleLoadComplete(ModuleLoadRequest* aRequest) override;
 
   bool IsModuleEvaluationAborted(ModuleLoadRequest* aRequest) override;
-
-  bool IsModuleTypeAllowed(JS::ModuleType aModuleType) override {
-    // https://html.spec.whatwg.org/#module-type-allowed
-    // If moduleType is "css" and the CSSStyleSheet interface is not exposed in
-    // settings's realm, then return false.
-    return aModuleType != JS::ModuleType::Unknown &&
-           aModuleType != JS::ModuleType::CSS;
-  }
 };
 
 }  // namespace mozilla::dom::workerinternals::loader

dom/worklet/loader/WorkletModuleLoader.cpp

@@ -103,8 +103,6 @@ nsresult WorkletModuleLoader::CompileFetchedModule(
       return CompileJavaScriptModule(aCx, aOptions, aRequest, aModuleScript);
     case JS::ModuleType::JSON:
       return CompileJsonModule(aCx, aOptions, aRequest, aModuleScript);
-    case JS::ModuleType::CSS:
-      MOZ_CRASH("CSS modules are not supported in worklets");
   }
 
   MOZ_CRASH("Unhandled module type");

dom/worklet/loader/WorkletModuleLoader.h

@@ -96,14 +96,6 @@ class WorkletModuleLoader : public JS::loader::ModuleLoaderBase {
                                     const nsAString& aSpecifier,
                                     nsAString& aResult) override;
 
-  bool IsModuleTypeAllowed(JS::ModuleType aModuleType) override {
-    // https://html.spec.whatwg.org/#module-type-allowed
-    // If moduleType is "css" and the CSSStyleSheet interface is not exposed in
-    // settings's realm, then return false.
-    return aModuleType != JS::ModuleType::Unknown &&
-           aModuleType != JS::ModuleType::CSS;
-  }
-
   // A hashtable to map a nsIURI(from main thread) to a ModuleLoadRequest(in
   // worklet thread).
   nsRefPtrHashtable<nsURIHashKey, JS::loader::ModuleLoadRequest>

js/loader/ModuleLoaderBase.cpp

@@ -101,6 +101,10 @@ void ModuleLoaderBase::EnsureModuleHooksInitialized() {
                                  HostReleaseTopLevelScript);
 }
 
+static bool ModuleTypeAllowed(ModuleType aModuleType) {
+  return aModuleType != ModuleType::Unknown;
+}
+
 static bool CreateBadModuleTypeError(JSContext* aCx, LoadedScript* aScript,
                                      nsIURI* aURI,
                                      MutableHandle<Value> aErrorOut) {
@@ -215,7 +219,7 @@ bool ModuleLoaderBase::HostLoadImportedModule(JSContext* aCx,
     MOZ_ASSERT(uri, "Failed to resolve module specifier");
 
     ModuleType moduleType = GetModuleRequestType(aCx, aModuleRequest);
-    if (!loader->IsModuleTypeAllowed(moduleType)) {
+    if (!ModuleTypeAllowed(moduleType)) {
       LOG(("ModuleLoaderBase::HostLoadImportedModule uri %s, bad module type",
            uri->GetSpecOrDefault().get()));
       Rooted<Value> error(aCx);