diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/html/custom')
51 files changed, 65 insertions, 63 deletions
diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element.cc index eeca328bf00..4992ea23f77 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element.cc @@ -158,7 +158,8 @@ Element* CustomElement::CreateUncustomizedOrUndefinedElementTemplate( } Element* element; - if (RuntimeEnabledFeatures::CustomElementsV0Enabled(&document)) { + if (RuntimeEnabledFeatures::CustomElementsV0Enabled( + document.GetExecutionContext())) { if (V0CustomElement::IsValidName(tag_name.LocalName()) && document.RegistrationContext()) { element = document.RegistrationContext()->CreateCustomTagElement( diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.cc index 3c4b80f4433..75d40046346 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.cc @@ -40,7 +40,7 @@ CustomElementDefinition::CustomElementDefinition( CustomElementDefinition::~CustomElementDefinition() = default; -void CustomElementDefinition::Trace(Visitor* visitor) { +void CustomElementDefinition::Trace(Visitor* visitor) const { visitor->Trace(construction_stack_); visitor->Trace(default_style_sheets_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.h index 4df21e145c3..26b288b56ce 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_definition.h @@ -42,7 +42,7 @@ class CORE_EXPORT CustomElementDefinition virtual ~CustomElementDefinition(); - virtual void Trace(Visitor*); + virtual void Trace(Visitor*) const; const char* NameInHeapSnapshot() const override { return "CustomElementDefinition"; } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.cc index dd88199be20..e7d7109daa4 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.cc @@ -12,7 +12,7 @@ CustomElementReaction::CustomElementReaction( CustomElementDefinition& definition) : definition_(definition) {} -void CustomElementReaction::Trace(Visitor* visitor) { +void CustomElementReaction::Trace(Visitor* visitor) const { visitor->Trace(definition_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.h index d3f60588e0c..59c30538f23 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction.h @@ -22,7 +22,7 @@ class CORE_EXPORT CustomElementReaction virtual void Invoke(Element&) = 0; - virtual void Trace(Visitor*); + virtual void Trace(Visitor*) const; protected: Member<CustomElementDefinition> definition_; diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_factory.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_factory.cc index 859dd263529..b0a62d6677e 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_factory.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_factory.cc @@ -79,7 +79,7 @@ class CustomElementAdoptedCallbackReaction final DCHECK(definition.HasAdoptedCallback()); } - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { visitor->Trace(old_owner_); visitor->Trace(new_owner_); CustomElementReaction::Trace(visitor); @@ -138,7 +138,7 @@ class CustomElementFormAssociatedCallbackReaction final DCHECK(definition.HasFormAssociatedCallback()); } - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { visitor->Trace(form_); CustomElementReaction::Trace(visitor); } @@ -206,7 +206,7 @@ class CustomElementFormStateRestoreCallbackReaction final DCHECK(mode == "restore" || mode == "autocomplete"); } - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { visitor->Trace(value_); CustomElementReaction::Trace(visitor); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.cc index 0f7c3ea14c1..1e78556eabe 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.cc @@ -14,7 +14,7 @@ CustomElementReactionQueue::CustomElementReactionQueue() : index_(0u) {} CustomElementReactionQueue::~CustomElementReactionQueue() = default; -void CustomElementReactionQueue::Trace(Visitor* visitor) { +void CustomElementReactionQueue::Trace(Visitor* visitor) const { visitor->Trace(reactions_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.h index 34dfc38337b..383236bc063 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_queue.h @@ -20,7 +20,7 @@ class CORE_EXPORT CustomElementReactionQueue final CustomElementReactionQueue(); ~CustomElementReactionQueue(); - void Trace(Visitor*); + void Trace(Visitor*) const; void Add(CustomElementReaction&); void InvokeReactions(Element&); diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.cc index 990283baa64..828b7c84da8 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.cc @@ -28,7 +28,7 @@ Persistent<CustomElementReactionStack>& GetCustomElementReactionStack() { CustomElementReactionStack::CustomElementReactionStack() = default; -void CustomElementReactionStack::Trace(Visitor* visitor) { +void CustomElementReactionStack::Trace(Visitor* visitor) const { visitor->Trace(map_); visitor->Trace(stack_); visitor->Trace(backup_queue_); diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.h index 9b10239b270..44b6a986005 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack.h @@ -23,7 +23,7 @@ class CORE_EXPORT CustomElementReactionStack final public: CustomElementReactionStack(); - void Trace(Visitor*); + void Trace(Visitor*) const; const char* NameInHeapSnapshot() const override { return "CustomElementReactionStack"; } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack_test.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack_test.cc index 7bfb1712cfe..b3a8d86dab5 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack_test.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_stack_test.cc @@ -192,7 +192,7 @@ class EnqueueToStack : public Command { CustomElementReaction* reaction) : stack_(stack), element_(element), reaction_(reaction) {} ~EnqueueToStack() override = default; - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { Command::Trace(visitor); visitor->Trace(stack_); visitor->Trace(element_); diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_test_helpers.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_test_helpers.h index 6450df0d6ec..ee3a1291d03 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_test_helpers.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_reaction_test_helpers.h @@ -26,7 +26,7 @@ class Command : public GarbageCollected<Command> { public: Command() = default; virtual ~Command() = default; - virtual void Trace(Visitor* visitor) {} + virtual void Trace(Visitor* visitor) const {} virtual void Run(Element&) = 0; DISALLOW_COPY_AND_ASSIGN(Command); @@ -74,7 +74,7 @@ class Recurse : public Command { public: Recurse(CustomElementReactionQueue* queue) : queue_(queue) {} ~Recurse() override = default; - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { Command::Trace(visitor); visitor->Trace(queue_); } @@ -91,7 +91,7 @@ class Enqueue : public Command { Enqueue(CustomElementReactionQueue* queue, CustomElementReaction* reaction) : queue_(queue), reaction_(reaction) {} ~Enqueue() override = default; - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { Command::Trace(visitor); visitor->Trace(queue_); visitor->Trace(reaction_); @@ -113,7 +113,7 @@ class TestReaction : public CustomElementReaction { CustomElementDescriptor("mock-element", "mock-element"))), commands_(commands) {} ~TestReaction() override = default; - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { CustomElementReaction::Trace(visitor); visitor->Trace(commands_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.cc index f1579312558..1bf7934ec3d 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.cc @@ -87,7 +87,7 @@ CustomElementRegistry::CustomElementRegistry(const LocalDOMWindow* owner) Entangle(v0); } -void CustomElementRegistry::Trace(Visitor* visitor) { +void CustomElementRegistry::Trace(Visitor* visitor) const { visitor->Trace(definitions_); visitor->Trace(owner_); visitor->Trace(v0_); diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.h index 3c959f93747..9f4d9ef6145 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry.h @@ -62,7 +62,7 @@ class CORE_EXPORT CustomElementRegistry final : public ScriptWrappable { void Entangle(V0CustomElementRegistrationContext*); - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: CustomElementDefinition* DefineInternal(ScriptState*, diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry_test.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry_test.cc index c50d69d521f..2696ad7e5f9 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry_test.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_registry_test.cc @@ -78,7 +78,7 @@ TEST_F(CustomElementRegistryTest, Element* element = CreateElement("a-a").InDocument(&GetDocument()); Registry().AddCandidate(*element); - auto* other_document = MakeGarbageCollected<HTMLDocument>(); + auto* other_document = HTMLDocument::CreateForTest(); other_document->AppendChild(element); EXPECT_EQ(other_document, element->ownerDocument()) << "sanity: another document should have adopted an element on append"; @@ -173,7 +173,7 @@ class LogUpgradeDefinition : public TestCustomElementDefinition { }, {}) {} - void Trace(Visitor* visitor) override { + void Trace(Visitor* visitor) const override { TestCustomElementDefinition::Trace(visitor); visitor->Trace(element_); visitor->Trace(adopted_); @@ -205,7 +205,7 @@ class LogUpgradeDefinition : public TestCustomElementDefinition { Member<Document> old_owner_; Member<Document> new_owner_; - void Trace(Visitor* visitor) { + void Trace(Visitor* visitor) const { visitor->Trace(old_owner_); visitor->Trace(new_owner_); } @@ -398,7 +398,7 @@ TEST_F(CustomElementRegistryTest, adoptedCallback) { static_cast<LogUpgradeDefinition*>(Registry().DefinitionForName("a-a")); definition->Clear(); - auto* other_document = MakeGarbageCollected<HTMLDocument>(); + auto* other_document = HTMLDocument::CreateForTest(); { CEReactionsScope reactions; other_document->adoptNode(element, ASSERT_NO_EXCEPTION); diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h b/chromium/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h index 915324b0e8b..03a18e0f77b 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_test_helpers.h @@ -154,7 +154,7 @@ class CreateElement { operator Element*() const { Document* document = document_; if (!document) - document = MakeGarbageCollected<HTMLDocument>(); + document = HTMLDocument::CreateForTest(); NonThrowableExceptionState no_exceptions; Element* element = document->CreateElement( QualifiedName(g_null_atom, local_name_, namespace_uri_), diff --git a/chromium/third_party/blink/renderer/core/html/custom/custom_element_upgrade_sorter_test.cc b/chromium/third_party/blink/renderer/core/html/custom/custom_element_upgrade_sorter_test.cc index f82ce78f372..924c2b38c7c 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/custom_element_upgrade_sorter_test.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/custom_element_upgrade_sorter_test.cc @@ -43,7 +43,7 @@ TEST_F(CustomElementUpgradeSorterTest, inOtherDocument_notInSet) { Element* element = GetDocument().CreateElementForBinding( "a-a", StringOrElementCreationOptions(), no_exceptions); - auto* other_document = MakeGarbageCollected<HTMLDocument>(); + auto* other_document = HTMLDocument::CreateForTest(); other_document->AppendChild(element); EXPECT_EQ(other_document, element->ownerDocument()) << "sanity: another document should have adopted an element on append"; diff --git a/chromium/third_party/blink/renderer/core/html/custom/element_internals.cc b/chromium/third_party/blink/renderer/core/html/custom/element_internals.cc index 731e5ebcad3..e879e1fbb08 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/element_internals.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/element_internals.cc @@ -49,7 +49,7 @@ class CustomStatesTokenList : public DOMTokenList { ElementInternals::ElementInternals(HTMLElement& target) : target_(target) { } -void ElementInternals::Trace(Visitor* visitor) { +void ElementInternals::Trace(Visitor* visitor) const { visitor->Trace(target_); visitor->Trace(value_); visitor->Trace(state_); diff --git a/chromium/third_party/blink/renderer/core/html/custom/element_internals.h b/chromium/third_party/blink/renderer/core/html/custom/element_internals.h index 18519174b08..4f2effbb1e7 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/element_internals.h +++ b/chromium/third_party/blink/renderer/core/html/custom/element_internals.h @@ -25,7 +25,7 @@ class CORE_EXPORT ElementInternals : public ScriptWrappable, public: ElementInternals(HTMLElement& target); - void Trace(Visitor* visitor) override; + void Trace(Visitor* visitor) const override; HTMLElement& Target() const { return *target_; } void DidUpgrade(); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.cc index 08aa4240504..3b91ebaa6a9 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.cc @@ -48,8 +48,8 @@ V0CustomElementMicrotaskImportStep* V0CustomElement::DidCreateImport( return V0CustomElementScheduler::ScheduleImport(import); } -void V0CustomElement::DidFinishLoadingImport(Document& master) { - master.CustomElementMicrotaskRunQueue()->RequestDispatchIfNeeded(); +void V0CustomElement::DidFinishLoadingImport(Document& tree_root) { + tree_root.CustomElementMicrotaskRunQueue()->RequestDispatchIfNeeded(); } static inline bool IsValidNCName(const AtomicString& name) { diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.h index 3fffa8901fd..0c3e255a3ae 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element.h @@ -52,7 +52,7 @@ class CORE_EXPORT V0CustomElement { // API to notify of document-level changes static V0CustomElementMicrotaskImportStep* DidCreateImport(HTMLImportChild*); - static void DidFinishLoadingImport(Document& master); + static void DidFinishLoadingImport(Document& tree_root); // API for registration contexts static void Define(Element*, V0CustomElementDefinition*); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.cc index 8550ba58cb0..47cb0add209 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.cc @@ -145,7 +145,7 @@ V0CustomElementCallbackInvocation::CreateAttributeChangedInvocation( old_value, new_value); } -void V0CustomElementCallbackInvocation::Trace(Visitor* visitor) { +void V0CustomElementCallbackInvocation::Trace(Visitor* visitor) const { visitor->Trace(callbacks_); V0CustomElementProcessingStep::Trace(visitor); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.h index 23e40003a9d..3250a3a330e 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_invocation.h @@ -56,7 +56,7 @@ class V0CustomElementCallbackInvocation : public V0CustomElementProcessingStep { V0CustomElementLifecycleCallbacks* Callbacks() { return callbacks_.Get(); } - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: Member<V0CustomElementLifecycleCallbacks> callbacks_; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.cc index 4bdeeaee120..0a9718ddad8 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.cc @@ -68,7 +68,7 @@ bool V0CustomElementCallbackQueue::ProcessInElementQueue( return did_work; } -void V0CustomElementCallbackQueue::Trace(Visitor* visitor) { +void V0CustomElementCallbackQueue::Trace(Visitor* visitor) const { visitor->Trace(element_); visitor->Trace(queue_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.h index 2ab98cd078f..22290f77bd3 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_callback_queue.h @@ -63,7 +63,7 @@ class V0CustomElementCallbackQueue } bool InCreatedCallback() const { return in_created_callback_; } - void Trace(Visitor*); + void Trace(Visitor*) const; private: Member<Element> element_; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.cc index e8b8a80ae74..1795303dde1 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.cc @@ -37,7 +37,7 @@ V0CustomElementDefinition::V0CustomElementDefinition( V0CustomElementLifecycleCallbacks* callbacks) : descriptor_(descriptor), callbacks_(callbacks) {} -void V0CustomElementDefinition::Trace(Visitor* visitor) { +void V0CustomElementDefinition::Trace(Visitor* visitor) const { visitor->Trace(callbacks_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.h index 79b5530aac3..a5af9378ace 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_definition.h @@ -47,7 +47,7 @@ class V0CustomElementDefinition final return callbacks_.Get(); } - void Trace(Visitor*); + void Trace(Visitor*) const; private: V0CustomElementDescriptor descriptor_; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_exception.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_exception.cc index e199eaadd23..d321126ef9f 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_exception.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_exception.cc @@ -30,6 +30,7 @@ #include "third_party/blink/renderer/core/html/custom/v0_custom_element_exception.h" +#include "base/notreached.h" #include "third_party/blink/renderer/platform/bindings/exception_state.h" namespace blink { diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_lifecycle_callbacks.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_lifecycle_callbacks.h index ea4407a710e..06190fc0ea2 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_lifecycle_callbacks.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_lifecycle_callbacks.h @@ -61,7 +61,7 @@ class V0CustomElementLifecycleCallbacks const AtomicString& old_value, const AtomicString& new_value) = 0; - virtual void Trace(Visitor* visitor) {} + virtual void Trace(Visitor* visitor) const {} protected: explicit V0CustomElementLifecycleCallbacks(CallbackType type) diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.cc index fe023ce0db4..1c781204b72 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.cc @@ -76,7 +76,7 @@ void V0CustomElementMicrotaskDispatcher::DoDispatch() { phase_ = kQuiescent; } -void V0CustomElementMicrotaskDispatcher::Trace(Visitor* visitor) { +void V0CustomElementMicrotaskDispatcher::Trace(Visitor* visitor) const { visitor->Trace(elements_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.h index 9aa1567285a..0eed206c421 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_dispatcher.h @@ -24,7 +24,7 @@ class V0CustomElementMicrotaskDispatcher final bool ElementQueueIsEmpty() { return elements_.IsEmpty(); } - void Trace(Visitor*); + void Trace(Visitor*) const; private: void EnsureMicrotaskScheduledForElementQueue(); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.cc index f4025118dc0..fcf21c00af0 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.cc @@ -70,7 +70,7 @@ V0CustomElementMicrotaskImportStep::Process() { return kFinishedProcessing; } -void V0CustomElementMicrotaskImportStep::Trace(Visitor* visitor) { +void V0CustomElementMicrotaskImportStep::Trace(Visitor* visitor) const { visitor->Trace(import_); visitor->Trace(queue_); V0CustomElementMicrotaskStep::Trace(visitor); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.h index c4c7efb9f29..566af67cfb2 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_import_step.h @@ -55,7 +55,7 @@ class V0CustomElementMicrotaskImportStep final void Invalidate(); void ImportDidFinishLoading(); - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: void DidUpgradeAllCustomElements(); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.cc index f043853f4df..25efaad36df 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.cc @@ -15,7 +15,7 @@ void V0CustomElementMicrotaskQueueBase::Dispatch() { in_dispatch_ = false; } -void V0CustomElementMicrotaskQueueBase::Trace(Visitor* visitor) { +void V0CustomElementMicrotaskQueueBase::Trace(Visitor* visitor) const { visitor->Trace(queue_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.h index 8855eee71d8..da4c6f039b6 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_queue_base.h @@ -20,7 +20,7 @@ class V0CustomElementMicrotaskQueueBase bool IsEmpty() const { return queue_.IsEmpty(); } void Dispatch(); - void Trace(Visitor*); + void Trace(Visitor*) const; #if !defined(NDEBUG) void Show(unsigned indent); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.cc index 22b212dbb61..f0a9f551f81 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.cc @@ -50,7 +50,7 @@ V0CustomElementMicrotaskResolutionStep::Process() { return V0CustomElementMicrotaskStep::kFinishedProcessing; } -void V0CustomElementMicrotaskResolutionStep::Trace(Visitor* visitor) { +void V0CustomElementMicrotaskResolutionStep::Trace(Visitor* visitor) const { visitor->Trace(context_); visitor->Trace(element_); V0CustomElementMicrotaskStep::Trace(visitor); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.h index 2d28a2dcb85..5288b6f9562 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_resolution_step.h @@ -48,7 +48,7 @@ class V0CustomElementMicrotaskResolutionStep final const V0CustomElementDescriptor&); ~V0CustomElementMicrotaskResolutionStep() override; - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: Result Process() override; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.cc index 5bc637f3a4c..20a96fef1b0 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.cc @@ -42,7 +42,7 @@ void V0CustomElementMicrotaskRunQueue::RequestDispatchIfNeeded() { dispatch_is_pending_ = true; } -void V0CustomElementMicrotaskRunQueue::Trace(Visitor* visitor) { +void V0CustomElementMicrotaskRunQueue::Trace(Visitor* visitor) const { visitor->Trace(sync_queue_); visitor->Trace(async_queue_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.h index b46ba996068..d6e3a8a6d06 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_run_queue.h @@ -25,7 +25,7 @@ class V0CustomElementMicrotaskRunQueue void RequestDispatchIfNeeded(); bool IsEmpty() const; - void Trace(Visitor*); + void Trace(Visitor*) const; private: void Dispatch(); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_step.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_step.h index 27f49c78ef0..3da59d78f1e 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_step.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_microtask_step.h @@ -46,7 +46,7 @@ class V0CustomElementMicrotaskStep virtual Result Process() = 0; - virtual void Trace(Visitor* visitor) {} + virtual void Trace(Visitor* visitor) const {} #if !defined(NDEBUG) virtual void Show(unsigned indent) = 0; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_observer.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_observer.h index 1c95d5febcd..c05ea7ddc78 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_observer.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_observer.h @@ -46,7 +46,7 @@ class V0CustomElementObserver // API for CustomElement to kick off notifications static void NotifyElementWasDestroyed(Element*); - virtual void Trace(Visitor* visitor) {} + virtual void Trace(Visitor* visitor) const {} protected: V0CustomElementObserver() = default; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.cc index 63e9648790b..627a3773747 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.cc @@ -92,7 +92,7 @@ void V0CustomElementProcessingStack::Enqueue( ++element_queue_end_; } -void V0CustomElementProcessingStack::Trace(Visitor* visitor) { +void V0CustomElementProcessingStack::Trace(Visitor* visitor) const { visitor->Trace(flattened_processing_stack_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.h index 62717b7e79e..c932c36806d 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_stack.h @@ -77,7 +77,7 @@ class CORE_EXPORT V0CustomElementProcessingStack static V0CustomElementProcessingStack& Instance(); void Enqueue(V0CustomElementCallbackQueue*); - void Trace(Visitor*); + void Trace(Visitor*) const; private: // The start of the element queue on the top of the processing diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_step.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_step.h index 64e2314be3e..23ff9aa87bb 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_step.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_processing_step.h @@ -45,7 +45,7 @@ class V0CustomElementProcessingStep virtual void Dispatch(Element*) = 0; virtual bool IsCreatedCallback() const { return false; } - virtual void Trace(Visitor* visitor) {} + virtual void Trace(Visitor* visitor) const {} DISALLOW_COPY_AND_ASSIGN(V0CustomElementProcessingStep); }; diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.cc index fa37f647b30..07ba6362261 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.cc @@ -178,7 +178,7 @@ void V0CustomElementRegistrationContext::SetV1( registry_.SetV1(v1); } -void V0CustomElementRegistrationContext::Trace(Visitor* visitor) { +void V0CustomElementRegistrationContext::Trace(Visitor* visitor) const { visitor->Trace(candidates_); visitor->Trace(registry_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.h index b810d5c081a..9e7baee49de 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registration_context.h @@ -65,7 +65,7 @@ class V0CustomElementRegistrationContext final bool NameIsDefined(const AtomicString& name) const; void SetV1(const CustomElementRegistry*); - void Trace(Visitor*); + void Trace(Visitor*) const; // Instance creation void DidGiveTypeExtension(Element*, const AtomicString& type); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.cc index c613e26f294..9d4fb89945c 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.cc @@ -141,7 +141,7 @@ bool V0CustomElementRegistry::V1NameIsDefined(const AtomicString& name) const { return v1_.Get() && v1_->NameIsDefined(name); } -void V0CustomElementRegistry::Trace(Visitor* visitor) { +void V0CustomElementRegistry::Trace(Visitor* visitor) const { visitor->Trace(definitions_); visitor->Trace(v1_); } diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.h index 477589e2fdf..8f43354c6af 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_registry.h @@ -51,7 +51,7 @@ class V0CustomElementRegistry final { DISALLOW_NEW(); public: - void Trace(Visitor*); + void Trace(Visitor*) const; void DocumentWasDetached() { document_was_detached_ = true; } protected: diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_scheduler.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_scheduler.cc index 7e9edadcea2..91b860eba41 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_scheduler.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_scheduler.cc @@ -149,11 +149,11 @@ void V0CustomElementScheduler::EnqueueMicrotaskStep( Document& document, V0CustomElementMicrotaskStep* step, bool import_is_sync) { - Document& master = document.ImportsController() - ? *(document.ImportsController()->Master()) - : document; - master.CustomElementMicrotaskRunQueue()->Enqueue(document.ImportLoader(), - step, import_is_sync); + Document& tree_root = document.ImportsController() + ? *(document.ImportsController()->TreeRoot()) + : document; + tree_root.CustomElementMicrotaskRunQueue()->Enqueue(document.ImportLoader(), + step, import_is_sync); } void V0CustomElementScheduler::CallbackDispatcherDidFinish() { diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.cc b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.cc index ee4ffdbb92e..28c5c0fc581 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.cc +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.cc @@ -85,7 +85,7 @@ V0CustomElementUpgradeCandidateMap::TakeUpgradeCandidatesFor( return candidates; } -void V0CustomElementUpgradeCandidateMap::Trace(Visitor* visitor) { +void V0CustomElementUpgradeCandidateMap::Trace(Visitor* visitor) const { visitor->Trace(upgrade_candidates_); visitor->Trace(unresolved_definitions_); V0CustomElementObserver::Trace(visitor); diff --git a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.h b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.h index b91c4ab656b..ee0232f17cb 100644 --- a/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.h +++ b/chromium/third_party/blink/renderer/core/html/custom/v0_custom_element_upgrade_candidate_map.h @@ -53,7 +53,7 @@ class V0CustomElementUpgradeCandidateMap final void Add(const V0CustomElementDescriptor&, Element*); ElementSet* TakeUpgradeCandidatesFor(const V0CustomElementDescriptor&); - void Trace(Visitor*) override; + void Trace(Visitor*) const override; private: void ElementWasDestroyed(Element*) override; |