Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: third_party/WebKit/Source/core/dom/ElementRareData.h

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/ElementRareData.h
diff --git a/third_party/WebKit/Source/core/dom/ElementRareData.h b/third_party/WebKit/Source/core/dom/ElementRareData.h
index 283dc135779f28e59fd3d14146c5905c5d97f692..fe196fb89ed539bba4cafc5fc5375e87f58407c6 100644
--- a/third_party/WebKit/Source/core/dom/ElementRareData.h
+++ b/third_party/WebKit/Source/core/dom/ElementRareData.h
@@ -32,6 +32,7 @@
#include "core/dom/NodeRareData.h"
#include "core/dom/PseudoElement.h"
#include "core/dom/PseudoElementData.h"
+#include "core/dom/custom/CustomElementDefinition.h"
#include "core/dom/custom/V0CustomElementDefinition.h"
#include "core/dom/shadow/ElementShadow.h"
#include "core/html/ClassList.h"
@@ -125,8 +126,12 @@ public:
void decrementCompositorProxiedProperties(uint32_t properties);
CompositorProxiedPropertySet* proxiedPropertyCounts() const { return m_proxiedProperties.get(); }
- void setCustomElementDefinition(V0CustomElementDefinition* definition) { m_customElementDefinition = definition; }
- V0CustomElementDefinition* customElementDefinition() const { return m_customElementDefinition.get(); }
+ void v0SetCustomElementDefinition(V0CustomElementDefinition* definition) { m_v0CustomElementDefinition = definition; }
+ V0CustomElementDefinition* v0CustomElementDefinition() const { return m_v0CustomElementDefinition.get(); }
+
+ void setCustomElementDefinition(CustomElementDefinition* definition) { m_customElementDefinition = definition; }
+ CustomElementDefinition* customElementDefinition() const { return m_customElementDefinition.get(); }
+
AttrNodeList& ensureAttrNodeList();
AttrNodeList* attrNodeList() { return m_attrNodeList.get(); }
@@ -172,7 +177,9 @@ private:
Member<ResizeObserverDataMap> m_resizeObserverData;
RefPtr<ComputedStyle> m_computedStyle;
- Member<V0CustomElementDefinition> m_customElementDefinition;
+ // TODO(davaajav):remove this field when v0 custom elements are deprecated
+ Member<V0CustomElementDefinition> m_v0CustomElementDefinition;
+ Member<CustomElementDefinition> m_customElementDefinition;
Member<PseudoElementData> m_pseudoElementData;
« no previous file with comments | « third_party/WebKit/Source/core/dom/Element.cpp ('k') | third_party/WebKit/Source/core/dom/ElementRareData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698