wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-03 06:18:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1334043 - Part 1: Replace attached callback (v0) with connected callback (v1).

Browse source 
Tag UXP Issue #1344
This commit is contained in:
Gaming4JC 2020-01-05 15:46:37 -05:00 • committed by Roy Tam
commit 207d5a2e3e
4 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

31
dom/base/CustomElementRegistry.cpp
View file

@ -28,14 +28,13 @@ CustomElementCallback::Call()
mOwnerData->mElementIsBeingCreated = true;
// The callback hasn't actually been invoked yet, but we need to flip
// this now in order to enqueue the attached callback. This is a spec
// this now in order to enqueue the connected callback. This is a spec
// bug (w3c bug 27437).
mOwnerData->mCreatedCallbackInvoked = true;
// If ELEMENT is in a document and this document has a browsing context,
// enqueue attached callback for ELEMENT.
// If ELEMENT is connected, enqueue connected callback for ELEMENT.
nsIDocument* document = mThisObject->GetComposedDoc();
if (document && document->GetDocShell()) {
if (document) {
NodeInfo* ni = mThisObject->NodeInfo();
nsDependentAtomString extType(mOwnerData->mType);
@ -48,15 +47,15 @@ CustomElementCallback::Call()
ni->LocalName(), ni->NamespaceID(),
extType.IsEmpty() ? nullptr : &extType);
nsContentUtils::EnqueueLifecycleCallback(
document, nsIDocument::eAttached, mThisObject, nullptr, definition);
document, nsIDocument::eConnected, mThisObject, nullptr, definition);
}
static_cast<LifecycleCreatedCallback *>(mCallback.get())->Call(mThisObject, rv);
mOwnerData->mElementIsBeingCreated = false;
break;
}
case nsIDocument::eAttached:
static_cast<LifecycleAttachedCallback *>(mCallback.get())->Call(mThisObject, rv);
case nsIDocument::eConnected:
static_cast<LifecycleConnectedCallback *>(mCallback.get())->Call(mThisObject, rv);
break;
case nsIDocument::eDetached:
static_cast<LifecycleDetachedCallback *>(mCallback.get())->Call(mThisObject, rv);
@ -349,9 +348,9 @@ CustomElementRegistry::CreateCustomElementCallback(
}
break;
case nsIDocument::eAttached:
if (aDefinition->mCallbacks->mAttachedCallback.WasPassed()) {
func = aDefinition->mCallbacks->mAttachedCallback.Value();
case nsIDocument::eConnected:
if (aDefinition->mCallbacks->mConnectedCallback.WasPassed()) {
func = aDefinition->mCallbacks->mConnectedCallback.Value();
}
break;
@ -934,7 +933,11 @@ CustomElementRegistry::Upgrade(Element* aElement,
}
// Step 4.
// TODO: Bug 1334043 - Implement connected lifecycle callbacks for custom elements
if (aElement->IsInComposedDoc()) {
nsContentUtils::EnqueueLifecycleCallback(aElement->OwnerDoc(),
nsIDocument::eConnected, aElement,
nullptr, aDefinition);
}
// Step 5.
AutoConstructionStackEntry acs(aDefinition->mConstructionStack,
@ -1129,9 +1132,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(CustomElementDefinition)
cb.NoteXPCOMChild(callbacks->mCreatedCallback.Value());
}
if (callbacks->mAttachedCallback.WasPassed()) {
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mCallbacks->mAttachedCallback");
cb.NoteXPCOMChild(callbacks->mAttachedCallback.Value());
if (callbacks->mConnectedCallback.WasPassed()) {
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mCallbacks->mConnectedCallback");
cb.NoteXPCOMChild(callbacks->mConnectedCallback.Value());
}
if (callbacks->mDetachedCallback.WasPassed()) {

15
dom/base/Element.cpp
View file

@ -1685,13 +1685,12 @@ Element::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
}
nsIDocument* composedDoc = GetComposedDoc();
if (composedDoc) {
// Attached callback must be enqueued whenever custom element is inserted into a
// document and this document has a browsing context.
if (GetCustomElementData() && composedDoc->GetDocShell()) {
// Enqueue an attached callback for the custom element.
if (CustomElementRegistry::IsCustomElementEnabled() && composedDoc) {
// Connected callback must be enqueued whenever a custom element becomes
// connected.
if (GetCustomElementData()) {
nsContentUtils::EnqueueLifecycleCallback(
composedDoc, nsIDocument::eAttached, this);
composedDoc, nsIDocument::eConnected, this);
}
}
@ -2586,7 +2585,7 @@ Element::SetAttrAndNotify(int32_t aNamespaceID,
UpdateState(aNotify);
if (nsContentUtils::IsWebComponentsEnabled()) {
if (CustomElementRegistry::IsCustomElementEnabled()) {
if (CustomElementData* data = GetCustomElementData()) {
if (CustomElementDefinition* definition =
nsContentUtils::GetElementDefinitionIfObservingAttr(this,
@ -2853,7 +2852,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aName,
UpdateState(aNotify);
if (nsContentUtils::IsWebComponentsEnabled()) {
if (CustomElementRegistry::IsCustomElementEnabled()) {
if (CustomElementData* data = GetCustomElementData()) {
if (CustomElementDefinition* definition =
nsContentUtils::GetElementDefinitionIfObservingAttr(this,

2
dom/base/nsIDocument.h
View file

@ -2580,7 +2580,7 @@ public:
enum ElementCallbackType {
eCreated,
eAttached,
eConnected,
eDetached,
eAttributeChanged
};

4
dom/webidl/WebComponents.webidl
View file

@ -11,7 +11,7 @@
*/
callback LifecycleCreatedCallback = void();
callback LifecycleAttachedCallback = void();
callback LifecycleConnectedCallback = void();
callback LifecycleDetachedCallback = void();
callback LifecycleAttributeChangedCallback = void(DOMString attrName,
DOMString? oldValue,
@ -20,7 +20,7 @@ callback LifecycleAttributeChangedCallback = void(DOMString attrName,
dictionary LifecycleCallbacks {
LifecycleCreatedCallback? createdCallback;
LifecycleAttachedCallback? attachedCallback;
LifecycleConnectedCallback? connectedCallback;
LifecycleDetachedCallback? detachedCallback;
LifecycleAttributeChangedCallback? attributeChangedCallback;
};