Move the CustomElementDefinition from ElementRareData to Element.

sky/engine/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1007 matching lines @@
 {
     if (styleChangeType() != NoStyleChange)
         return;
 
     setNeedsStyleRecalc(LocalStyleChange);
     setAnimationStyleChange(true);
 }
 
 void Element::setCustomElementDefinition(PassRefPtr<CustomElementDefinition> definition)
 {
-    if (!hasRareData() && !definition)
-        return;
-    ASSERT(!customElementDefinition());
-    ensureElementRareData().setCustomElementDefinition(definition);
+    ASSERT(!m_customElementDefinition);
+    m_customElementDefinition = definition;
 }
 
 CustomElementDefinition* Element::customElementDefinition() const
 {
-    if (hasRareData())
-        return elementRareData()->customElementDefinition();
-    return 0;
+    return m_customElementDefinition.get();
 }
 
 // TODO(esprehn): Implement the sky spec where shadow roots are a custom
 // element registration feature.
 PassRefPtr<ShadowRoot> Element::ensureShadowRoot(ExceptionState& exceptionState)
 {
     if (ShadowRoot* root = shadowRoot())
         return root;
     return PassRefPtr<ShadowRoot>(ensureShadow().addShadowRoot(*this));
 }
@@ skipping 692 matching lines @@
         return false;
     if (treeScope().scopedStyleResolver().hasSelectorForId(idValue))
         return true;
     // Host rules could also have effects.
     if (ShadowRoot* shadowRoot = this->shadowRoot())
         return shadowRoot->scopedStyleResolver().hasSelectorForId(idValue);
     return false;
 }
 
 } // namespace blink