Index: third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp |
diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp b/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp |
index 6db283ccd58a7a75331003f4d3758c0d2120d1d9..bf8acd6fe36eabce44f76102a7394b91cb2ee86e 100644 |
--- a/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp |
+++ b/third_party/WebKit/Source/core/dom/custom/CustomElementDefinition.cpp |
@@ -4,6 +4,7 @@ |
#include "core/dom/custom/CustomElementDefinition.h" |
+#include "core/dom/Attr.h" |
#include "core/dom/ExceptionCode.h" |
#include "core/dom/custom/CEReactionsScope.h" |
#include "core/dom/custom/CustomElement.h" |
@@ -21,6 +22,14 @@ CustomElementDefinition::CustomElementDefinition( |
{ |
} |
+CustomElementDefinition::CustomElementDefinition( |
+ const CustomElementDescriptor& descriptor, |
+ const HashSet<AtomicString>& observedAttributes) |
+ : m_observedAttributes(observedAttributes) |
+ , m_descriptor(descriptor) |
+{ |
+} |
+ |
CustomElementDefinition::~CustomElementDefinition() |
{ |
} |
@@ -93,14 +102,8 @@ HTMLElement* CustomElementDefinition::createElementAsync(Document& document, con |
// https://html.spec.whatwg.org/multipage/scripting.html#concept-upgrade-an-element |
void CustomElementDefinition::upgrade(Element* element) |
{ |
- // TODO(kojii): This should be reversed by exposing observedAttributes from |
- // ScriptCustomElementDefinition, because Element::attributes() requires |
- // attribute synchronizations, and generally elements have more attributes |
- // than custom elements observe. |
- for (const auto& attribute : element->attributes()) { |
- if (hasAttributeChangedCallback(attribute.name())) |
- enqueueAttributeChangedCallback(element, attribute.name(), nullAtom, attribute.value()); |
- } |
+ if (!m_observedAttributes.isEmpty()) |
+ enqueueAttributeChangedCallbackForAllAttributes(element); |
if (element->inShadowIncludingDocument() && hasConnectedCallback()) |
enqueueConnectedCallback(element); |
@@ -122,6 +125,12 @@ void CustomElementDefinition::upgrade(Element* element) |
CHECK(element->getCustomElementState() == CustomElementState::Custom); |
} |
+bool CustomElementDefinition::hasAttributeChangedCallback( |
+ const QualifiedName& name) |
+{ |
+ return m_observedAttributes.contains(name.localName()); |
+} |
+ |
static void enqueueReaction(Element* element, CustomElementReaction* reaction) |
{ |
// CEReactionsScope must be created by [CEReactions] in IDL, |
@@ -152,4 +161,20 @@ void CustomElementDefinition::enqueueAttributeChangedCallback(Element* element, |
enqueueReaction(element, new CustomElementAttributeChangedCallbackReaction(this, name, oldValue, newValue)); |
} |
+void CustomElementDefinition::enqueueAttributeChangedCallbackForAllAttributes( |
+ Element* element) |
+{ |
+ // Avoid synchronizing all attributes unless it is needed, while enqueing |
+ // callbacks "in order" as defined in the spec. |
+ // https://html.spec.whatwg.org/multipage/scripting.html#concept-upgrade-an-element |
+ for (const AtomicString& name : m_observedAttributes) |
+ element->synchronizeAttribute(name); |
+ for (const auto& attribute : element->attributesWithoutUpdate()) { |
+ if (hasAttributeChangedCallback(attribute.name())) { |
+ enqueueAttributeChangedCallback(element, attribute.name(), |
+ nullAtom, attribute.value()); |
+ } |
+ } |
+} |
+ |
} // namespace blink |