third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp - Issue 2170383002: CustomElements: adopt node

Unified Diff: third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp

Issue 2170383002: CustomElements: adopt node (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge conflict resolution Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp

diff --git a/third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp b/third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp

index be36cefc99a2982f3034cec0c7b9bbb2596ecbee..41c3e58646ded90f0203849ac1ff15ad8957f1c0 100644

--- a/third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp

+++ b/third_party/WebKit/Source/core/dom/custom/V0CustomElement.cpp

@@ -111,7 +111,7 @@ void V0CustomElement::define(Element* element, V0CustomElementDefinition* defini

break;

case Element::V0WaitingForUpgrade:

- element->setCustomElementDefinition(definition);

+ element->v0SetCustomElementDefinition(definition);

V0CustomElementScheduler::scheduleCallback(definition->callbacks(), element, V0CustomElementLifecycleCallbacks::CreatedCallback);

break;

}

@@ -120,7 +120,7 @@ void V0CustomElement::define(Element* element, V0CustomElementDefinition* defini

void V0CustomElement::attributeDidChange(Element* element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)

{

DCHECK_EQ(element->getV0CustomElementState(), Element::V0Upgraded);

- V0CustomElementScheduler::scheduleAttributeChangedCallback(element->customElementDefinition()->callbacks(), element, name, oldValue, newValue);

+ V0CustomElementScheduler::scheduleAttributeChangedCallback(element->v0CustomElementDefinition()->callbacks(), element, name, oldValue, newValue);

}

void V0CustomElement::didAttach(Element* element, const Document& document)

@@ -128,7 +128,7 @@ void V0CustomElement::didAttach(Element* element, const Document& document)

DCHECK_EQ(element->getV0CustomElementState(), Element::V0Upgraded);

if (!document.domWindow())

return;

- V0CustomElementScheduler::scheduleCallback(element->customElementDefinition()->callbacks(), element, V0CustomElementLifecycleCallbacks::AttachedCallback);

+ V0CustomElementScheduler::scheduleCallback(element->v0CustomElementDefinition()->callbacks(), element, V0CustomElementLifecycleCallbacks::AttachedCallback);

}

void V0CustomElement::didDetach(Element* element, const Document& document)

@@ -136,7 +136,7 @@ void V0CustomElement::didDetach(Element* element, const Document& document)

DCHECK_EQ(element->getV0CustomElementState(), Element::V0Upgraded);

if (!document.domWindow())

return;

- V0CustomElementScheduler::scheduleCallback(element->customElementDefinition()->callbacks(), element, V0CustomElementLifecycleCallbacks::DetachedCallback);

+ V0CustomElementScheduler::scheduleCallback(element->v0CustomElementDefinition()->callbacks(), element, V0CustomElementLifecycleCallbacks::DetachedCallback);

}

void V0CustomElement::wasDestroyed(Element* element)

« no previous file with comments | « third_party/WebKit/Source/core/dom/custom/CustomElementsRegistryTest.cpp ('k') | no next file » | no next file with comments »