ChangeLog

2011-01-17  MORITA Hajime  <morrita@google.com>

        Reviewed by NOBODY (OOPS!).

        ElementRareData::m_shadowRoot should not be RefPtr.

        https://bugs.webkit.org/show_bug.cgi?id=51914

        This change makes m_shadowRoot a raw pointer, as Node::m_parent is.

        This change is safe because shadow host pointer is stored as TreeShared::m_parent

        which prevents deletion unless set to null.

        No test, no behavioral change.

        * dom/Element.cpp:

        (WebCore::Element::shadowRoot):

        (WebCore::Element::setShadowRoot):

        (WebCore::Element::removeShadowRoot):

        * dom/ElementRareData.h:

        (WebCore::ElementRareData::ElementRareData):

2011-01-16  Martin Robinson  <mrobinson@igalia.com>

        Reviewed by Xan Lopez.

Source/WebCore/dom/Element.cpp

@@void Element::recalcStyle(StyleChange change)

Node* Element::shadowRoot()

{

1087 return hasRareData() ? rareData()->m_shadowRoot~~.get()~~ : 0;

1087 return hasRareData() ? rareData()->m_shadowRoot : 0;

}

void Element::setShadowRoot(PassRefPtr<Node> node)

@@void Element::setShadowRoot(PassRefPtr<Node> node)

    // about compromising DOM tree integrity (eg. node being a parent of this). However,

    // once we implement XBL2, we will have to add integrity checks here.

    removeShadowRoot();

1096 RefPtr<Node> newRoot = node;

1097 if (!newRoot)

1096 if (!node)

10981097 return;

10991098

1100 ensureRareData()->m_shadowRoot = newRoot;

1101 newRoot->setShadowHost(this);

    ElementRareData* data = ensureRareData();

    data->m_shadowRoot = node.leakRef();

    data->m_shadowRoot->setShadowHost(this);

}

void Element::removeShadowRoot()

@@void Element::removeShadowRoot()

    if (!hasRareData())

        return;

1109 if (RefPtr<Node> oldRoot = rareData()->m_shadowRoot.release()) {

    ElementRareData* data = rareData();

    if (data->m_shadowRoot) {

        RefPtr<Node> oldRoot = data->m_shadowRoot;

        data->m_shadowRoot = 0;

        document()->removeFocusedNodeOfSubtree(oldRoot.get());

        oldRoot->setShadowHost(0);

        if (oldRoot->inDocument())

Source/WebCore/dom/ElementRareData.h

@@public:

    IntSize m_minimumSizeForResizing;

    RefPtr<RenderStyle> m_computedStyle;

44 ~~RefPtr<~~Node> m_shadowRoot;

44 Node* m_shadowRoot;

    OwnPtr<DatasetDOMStringMap> m_datasetDOMStringMap;

    OwnPtr<ClassList> m_classList;

@@inline IntSize defaultMinimumSizeForResizing()

inline ElementRareData::ElementRareData()

    : m_minimumSizeForResizing(defaultMinimumSizeForResizing())

57 , m_shadowRoot(0)

{

}