CustomElements: adopt node

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

 /*
  * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith <catfish.man@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 14 matching lines @@
 #include "core/animation/ElementAnimations.h"
 #include "core/css/cssom/InlineStylePropertyMap.h"
 #include "core/dom/Attr.h"
 #include "core/dom/CompositorProxiedPropertySet.h"
 #include "core/dom/DatasetDOMStringMap.h"
 #include "core/dom/NamedNodeMap.h"
 #include "core/dom/NodeIntersectionObserverData.h"
 #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"
 #include "core/style/StyleInheritedData.h"
 #include "platform/heap/Handle.h"
 #include "wtf/HashSet.h"
 #include <memory>
 
 namespace blink {
 
@@ skipping 73 matching lines @@
         m_elementAnimations = elementAnimations;
     }
 
     bool hasPseudoElements() const;
     void clearPseudoElements();
 
     void incrementCompositorProxiedProperties(uint32_t properties);
     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(); }
     void removeAttrNodeList() { m_attrNodeList.clear(); }
 
     NodeIntersectionObserverData* intersectionObserverData() const { return m_intersectionObserverData.get(); }
     NodeIntersectionObserverData& ensureIntersectionObserverData()
     {
         if (!m_intersectionObserverData)
             m_intersectionObserverData = new NodeIntersectionObserverData();
@@ skipping 25 matching lines @@
     Member<AttrNodeList> m_attrNodeList;
     Member<InlineCSSStyleDeclaration> m_cssomWrapper;
     Member<InlineStylePropertyMap> m_cssomMapWrapper;
     std::unique_ptr<CompositorProxiedPropertySet> m_proxiedProperties;
 
     Member<ElementAnimations> m_elementAnimations;
     Member<NodeIntersectionObserverData> m_intersectionObserverData;
     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;
 
     explicit ElementRareData(LayoutObject*);
 };
 
 inline LayoutSize defaultMinimumSizeForResizing()
 {
     return LayoutSize(LayoutUnit::max(), LayoutUnit::max());
 }
@@ skipping 54 matching lines @@
 inline CompositorProxiedPropertySet& ElementRareData::ensureCompositorProxiedPropertySet()
 {
     if (!m_proxiedProperties)
         m_proxiedProperties = CompositorProxiedPropertySet::create();
     return *m_proxiedProperties;
 }
 
 } // namespace blink
 
 #endif // ElementRareData_h