зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1637159 rename BindToOwnerInternal() to BindToOwner() r=smaug
This method can be and is used by derived classes as well as DOMEventTargetHelper itself, so it does not need to be "Internal". Differential Revision: https://phabricator.services.mozilla.com/D75246
This commit is contained in:
Родитель
57c91c20a0
Коммит
edd2019f42
|
@ -271,7 +271,7 @@ void DOMEventTargetHelper::MaybeDontKeepAlive() {
|
|||
}
|
||||
}
|
||||
|
||||
void DOMEventTargetHelper::BindToOwnerInternal(nsIGlobalObject* aOwner) {
|
||||
void DOMEventTargetHelper::BindToOwner(nsIGlobalObject* aOwner) {
|
||||
MOZ_ASSERT(!mParentObject);
|
||||
|
||||
if (aOwner) {
|
||||
|
|
|
@ -49,14 +49,14 @@ class DOMEventTargetHelper : public dom::EventTarget,
|
|||
mHasOrHasHadOwnerWindow(false),
|
||||
mIsKeptAlive(false) {
|
||||
nsIGlobalObject* global = aWindow ? aWindow->AsGlobal() : nullptr;
|
||||
BindToOwnerInternal(global);
|
||||
BindToOwner(global);
|
||||
}
|
||||
explicit DOMEventTargetHelper(nsIGlobalObject* aGlobalObject)
|
||||
: mParentObject(nullptr),
|
||||
mOwnerWindow(nullptr),
|
||||
mHasOrHasHadOwnerWindow(false),
|
||||
mIsKeptAlive(false) {
|
||||
BindToOwnerInternal(aGlobalObject);
|
||||
BindToOwner(aGlobalObject);
|
||||
}
|
||||
explicit DOMEventTargetHelper(DOMEventTargetHelper* aOther)
|
||||
: mParentObject(nullptr),
|
||||
|
@ -64,10 +64,10 @@ class DOMEventTargetHelper : public dom::EventTarget,
|
|||
mHasOrHasHadOwnerWindow(false),
|
||||
mIsKeptAlive(false) {
|
||||
if (!aOther) {
|
||||
BindToOwnerInternal(static_cast<nsIGlobalObject*>(nullptr));
|
||||
BindToOwner(static_cast<nsIGlobalObject*>(nullptr));
|
||||
return;
|
||||
}
|
||||
BindToOwnerInternal(aOther->GetParentObject());
|
||||
BindToOwner(aOther->GetParentObject());
|
||||
mHasOrHasHadOwnerWindow = aOther->HasOrHasHadOwner();
|
||||
}
|
||||
|
||||
|
@ -182,7 +182,7 @@ class DOMEventTargetHelper : public dom::EventTarget,
|
|||
void IgnoreKeepAliveIfHasListenersFor(const nsAString& aType);
|
||||
void IgnoreKeepAliveIfHasListenersFor(nsAtom* aType);
|
||||
|
||||
void BindToOwnerInternal(nsIGlobalObject* aOwner);
|
||||
void BindToOwner(nsIGlobalObject* aOwner);
|
||||
|
||||
private:
|
||||
// The parent global object. The global will clear this when
|
||||
|
|
|
@ -156,7 +156,7 @@ WorkerGlobalScopeBase::WorkerGlobalScopeBase(
|
|||
|
||||
// In workers, each DETH must have an owner. Because the global scope doesn't
|
||||
// have one, let's set it as owner of itself.
|
||||
BindToOwnerInternal(static_cast<nsIGlobalObject*>(this));
|
||||
BindToOwner(static_cast<nsIGlobalObject*>(this));
|
||||
}
|
||||
|
||||
JSObject* WorkerGlobalScopeBase::GetGlobalJSObject() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче