Yoshi Cheng-Hao Huang
3643c2cc49
Forward-declare JS::loader::ModuleLoaderBase in both headers and move the special members that touch the RefPtr<ModuleLoaderBase> member (constructor, destructor, and SystemGlobal::InitModuleLoader) out of line. This severs the xpcprivate.h include path, so the many dom/base, dom/bindings and build-glue translation units that only reached ModuleLoaderBase.h transitively no longer pull it in. Worklet.cpp used ResolveError/ResolveErrorInfo transitively through the removed include, so include js/loader/ResolveResult.h directly there. Translation Units recompiled: $ rg -l --no-ignore --hidden --glob '*.o.pp' 'ModuleLoaderBase\.h' obj-x86_64-pc-linux-gnu | wc -l Before this patch: 40 After this patch : 20 Differential Revision: https://phabricator.services.mozilla.com/D312139
122 lines
4.0 KiB
C++
122 lines
4.0 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "Worklet.h"
|
|
|
|
#include "WorkletThread.h"
|
|
#include "js/loader/ResolveResult.h"
|
|
#include "mozilla/dom/WorkletFetchHandler.h"
|
|
#include "mozilla/dom/WorkletImpl.h"
|
|
#include "xpcprivate.h"
|
|
|
|
using JS::loader::ResolveError;
|
|
using JS::loader::ResolveErrorInfo;
|
|
|
|
namespace mozilla::dom {
|
|
// ---------------------------------------------------------------------------
|
|
// Worklet
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_CLASS(Worklet)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Worklet)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwnedObject)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mImportHandlers)
|
|
tmp->mImpl->NotifyWorkletFinished();
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Worklet)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwnedObject)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mImportHandlers)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(Worklet)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(Worklet)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Worklet)
|
|
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
Worklet::Worklet(nsPIDOMWindowInner* aWindow, RefPtr<WorkletImpl> aImpl,
|
|
nsISupports* aOwnedObject)
|
|
: mWindow(aWindow), mOwnedObject(aOwnedObject), mImpl(std::move(aImpl)) {
|
|
MOZ_ASSERT(aWindow);
|
|
MOZ_ASSERT(mImpl);
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
}
|
|
|
|
Worklet::~Worklet() { mImpl->NotifyWorkletFinished(); }
|
|
|
|
JSObject* Worklet::WrapObject(JSContext* aCx,
|
|
JS::Handle<JSObject*> aGivenProto) {
|
|
return mImpl->WrapWorklet(aCx, this, aGivenProto);
|
|
}
|
|
|
|
static bool LoadLocalizedStrings(nsTArray<nsString>& aStrings) {
|
|
// All enumes in ResolveError.
|
|
ResolveError errors[] = {ResolveError::Failure,
|
|
ResolveError::FailureMayBeBare,
|
|
ResolveError::BlockedByNullEntry,
|
|
ResolveError::BlockedByAfterPrefix,
|
|
ResolveError::BlockedByBacktrackingPrefix,
|
|
ResolveError::InvalidBareSpecifier};
|
|
|
|
static_assert(
|
|
std::size(errors) == static_cast<size_t>(ResolveError::Length),
|
|
"The array 'errors' has missing entries in the enum class ResolveError.");
|
|
|
|
for (auto i : errors) {
|
|
nsAutoString message;
|
|
nsresult rv = nsContentUtils::GetLocalizedString(
|
|
PropertiesFile::DOM_PROPERTIES, ResolveErrorInfo::GetString(i),
|
|
message);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
if (NS_WARN_IF(!aStrings.AppendElement(EmptyString(), fallible))) {
|
|
return false;
|
|
}
|
|
} else {
|
|
if (NS_WARN_IF(!aStrings.AppendElement(message, fallible))) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
already_AddRefed<Promise> Worklet::AddModule(JSContext* aCx,
|
|
const nsAString& aModuleURL,
|
|
const WorkletOptions& aOptions,
|
|
CallerType aCallerType,
|
|
ErrorResult& aRv) {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
if (mLocalizedStrings.IsEmpty()) {
|
|
bool result = LoadLocalizedStrings(mLocalizedStrings);
|
|
if (!result) {
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
return WorkletFetchHandler::AddModule(this, aCx, aModuleURL, aOptions, aRv);
|
|
}
|
|
|
|
WorkletFetchHandler* Worklet::GetImportFetchHandler(const nsACString& aURI) {
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
return mImportHandlers.GetWeak(aURI);
|
|
}
|
|
|
|
void Worklet::AddImportFetchHandler(const nsACString& aURI,
|
|
WorkletFetchHandler* aHandler) {
|
|
MOZ_ASSERT(aHandler);
|
|
MOZ_ASSERT(!mImportHandlers.GetWeak(aURI));
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
mImportHandlers.InsertOrUpdate(aURI, RefPtr{aHandler});
|
|
}
|
|
|
|
} // namespace mozilla::dom
|