CustomElements: adopt node

third_party/WebKit/Source/core/dom/ElementRareData.h

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..694a73de83cc6fc753b205011d453afde89a143b 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,8 @@ private:
     Member<ResizeObserverDataMap> m_resizeObserverData;
 
     RefPtr<ComputedStyle> m_computedStyle;
-    Member<V0CustomElementDefinition> m_customElementDefinition;
+    Member<V0CustomElementDefinition> m_v0customElementDefinition;

[dominicc (has gone to gerrit), 2016/08/03 07:56:56]

As above, treat v0 like a word, so this should be m_v0CustomElementDefinition;
note the big "C".

Koji mentioned storing these pointers in one field, because you can never have
both at once. But I think it is safer to have them separate this way, because
mixing up the type of a pointer is a classic cause of security bugs.

Could you put a TODO on m_v0CustomElementDefinition to remove this field when v0
custom elements are deprecated? If someone sees the "duplicate" fields they
should be placated knowing one of them is going away soon.

+    Member<CustomElementDefinition> m_customElementDefinition;
 
     Member<PseudoElementData> m_pseudoElementData;