diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 098340e912ae..5925426f3d14 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -8770,65 +8770,6 @@ nsContentUtils::GetWindowRoot(nsIDocument* aDoc) return nullptr; } -/* static */ -nsContentPolicyType -nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType) -{ - switch (aType) { - case nsIContentPolicy::TYPE_INTERNAL_SCRIPT: - case nsIContentPolicy::TYPE_INTERNAL_SCRIPT_PRELOAD: - case nsIContentPolicy::TYPE_INTERNAL_WORKER: - case nsIContentPolicy::TYPE_INTERNAL_SHARED_WORKER: - case nsIContentPolicy::TYPE_INTERNAL_SERVICE_WORKER: - case nsIContentPolicy::TYPE_INTERNAL_WORKER_IMPORT_SCRIPTS: - return nsIContentPolicy::TYPE_SCRIPT; - - case nsIContentPolicy::TYPE_INTERNAL_EMBED: - case nsIContentPolicy::TYPE_INTERNAL_OBJECT: - return nsIContentPolicy::TYPE_OBJECT; - - case nsIContentPolicy::TYPE_INTERNAL_FRAME: - case nsIContentPolicy::TYPE_INTERNAL_IFRAME: - return nsIContentPolicy::TYPE_SUBDOCUMENT; - - case nsIContentPolicy::TYPE_INTERNAL_AUDIO: - case nsIContentPolicy::TYPE_INTERNAL_VIDEO: - case nsIContentPolicy::TYPE_INTERNAL_TRACK: - return nsIContentPolicy::TYPE_MEDIA; - - case nsIContentPolicy::TYPE_INTERNAL_XMLHTTPREQUEST: - case nsIContentPolicy::TYPE_INTERNAL_EVENTSOURCE: - return nsIContentPolicy::TYPE_XMLHTTPREQUEST; - - case nsIContentPolicy::TYPE_INTERNAL_IMAGE: - case nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD: - case nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON: - return nsIContentPolicy::TYPE_IMAGE; - - case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET: - case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD: - return nsIContentPolicy::TYPE_STYLESHEET; - - default: - return aType; - } -} - -/* static */ -nsContentPolicyType -nsContentUtils::InternalContentPolicyTypeToExternalOrWorker(nsContentPolicyType aType) -{ - switch (aType) { - case nsIContentPolicy::TYPE_INTERNAL_WORKER: - case nsIContentPolicy::TYPE_INTERNAL_SHARED_WORKER: - case nsIContentPolicy::TYPE_INTERNAL_SERVICE_WORKER: - return aType; - - default: - return InternalContentPolicyTypeToExternal(aType); - } -} - /* static */ bool nsContentUtils::IsPreloadType(nsContentPolicyType aType) diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 984b0d2e521e..6852ef009aa1 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1160,7 +1160,8 @@ public: /** * Map internal content policy types to external ones. */ - static nsContentPolicyType InternalContentPolicyTypeToExternal(nsContentPolicyType aType); + static inline nsContentPolicyType + InternalContentPolicyTypeToExternal(nsContentPolicyType aType); /** * Map internal content policy types to external ones or preload types: @@ -1170,7 +1171,8 @@ public: * * Note: DO NOT call this function unless you know what you're doing! */ - static nsContentPolicyType InternalContentPolicyTypeToExternalOrPreload(nsContentPolicyType aType); + static inline nsContentPolicyType + InternalContentPolicyTypeToExternalOrPreload(nsContentPolicyType aType); /** * Map internal content policy types to external ones, worker, or preload types: @@ -3109,6 +3111,65 @@ private: static mozilla::LazyLogModule sDOMDumpLog; }; +/* static */ inline +nsContentPolicyType +nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType) +{ + switch (aType) { + case nsIContentPolicy::TYPE_INTERNAL_SCRIPT: + case nsIContentPolicy::TYPE_INTERNAL_SCRIPT_PRELOAD: + case nsIContentPolicy::TYPE_INTERNAL_WORKER: + case nsIContentPolicy::TYPE_INTERNAL_SHARED_WORKER: + case nsIContentPolicy::TYPE_INTERNAL_SERVICE_WORKER: + case nsIContentPolicy::TYPE_INTERNAL_WORKER_IMPORT_SCRIPTS: + return nsIContentPolicy::TYPE_SCRIPT; + + case nsIContentPolicy::TYPE_INTERNAL_EMBED: + case nsIContentPolicy::TYPE_INTERNAL_OBJECT: + return nsIContentPolicy::TYPE_OBJECT; + + case nsIContentPolicy::TYPE_INTERNAL_FRAME: + case nsIContentPolicy::TYPE_INTERNAL_IFRAME: + return nsIContentPolicy::TYPE_SUBDOCUMENT; + + case nsIContentPolicy::TYPE_INTERNAL_AUDIO: + case nsIContentPolicy::TYPE_INTERNAL_VIDEO: + case nsIContentPolicy::TYPE_INTERNAL_TRACK: + return nsIContentPolicy::TYPE_MEDIA; + + case nsIContentPolicy::TYPE_INTERNAL_XMLHTTPREQUEST: + case nsIContentPolicy::TYPE_INTERNAL_EVENTSOURCE: + return nsIContentPolicy::TYPE_XMLHTTPREQUEST; + + case nsIContentPolicy::TYPE_INTERNAL_IMAGE: + case nsIContentPolicy::TYPE_INTERNAL_IMAGE_PRELOAD: + case nsIContentPolicy::TYPE_INTERNAL_IMAGE_FAVICON: + return nsIContentPolicy::TYPE_IMAGE; + + case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET: + case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD: + return nsIContentPolicy::TYPE_STYLESHEET; + + default: + return aType; + } +} + +/* static */ inline +nsContentPolicyType +nsContentUtils::InternalContentPolicyTypeToExternalOrWorker(nsContentPolicyType aType) +{ + switch (aType) { + case nsIContentPolicy::TYPE_INTERNAL_WORKER: + case nsIContentPolicy::TYPE_INTERNAL_SHARED_WORKER: + case nsIContentPolicy::TYPE_INTERNAL_SERVICE_WORKER: + return aType; + + default: + return InternalContentPolicyTypeToExternal(aType); + } +} + class MOZ_RAII nsAutoScriptBlocker { public: explicit nsAutoScriptBlocker(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM) {