WebCore/ChangeLog

2010-12-13  Dimitri Glazkov  <dglazkov@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Combine setShadowRoot and clearShadowRoot into a simpler API

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

        No change in behavior, and API is not used yet.

        * dom/Element.cpp:

        (WebCore::Element::setShadowRoot): Combined clearing and setting of

            the shadowRoot, also hooked up with setting and clearing of the

            corresponding shadowHost values.

        * dom/Element.h: removed clearShadowRoot def.

        * dom/Node.h: Made shadow host-related functions public.

2010-12-14  Alexander Pavlov  <apavlov@chromium.org>

        Reviewed by Yury Semikhatsky.

WebCore/dom/Element.cpp

@@Node* Element::shadowRoot()

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

{

    ASSERT(node);

    // FIXME: Once all instances of shadow DOM are converted to use this code, add setting of shadow host (shadowParent) on node.

    ensureRareData()->m_shadowRoot = node;

}

    RefPtr<Node> newRoot = node;

    if (hasRareData()) {

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

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

            oldRoot->setShadowHost(0);

            if (oldRoot->inDocument())

                oldRoot->removedFromDocument();

            else

                oldRoot->removedFromTree(true);

        }

    }

10901096

void Element::clearShadowRoot()

{

    if (!hasRareData())

1097 if (!newRoot)

10941098 return;

10951099

    RefPtr<Node> shadowRoot = rareData()->m_shadowRoot.release();

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

    // FIXME: Once all instances of shadow DOM are converted to use this code, add clearing of shadow host (shadowParent).

    if (shadowRoot->inDocument())

        shadowRoot->removedFromDocument();

    else

        shadowRoot->removedFromTree(true);

1100 ensureRareData()->m_shadowRoot = newRoot;

1101 newRoot->setShadowHost(this);

}

bool Element::childTypeAllowed(NodeType type)

WebCore/dom/Element.h

@@public:

    Node* shadowRoot();

    void setShadowRoot(PassRefPtr<Node>);

230 void clearShadowRoot();

    RenderStyle* computedStyle(PseudoId = NOPSEUDO);

WebCore/dom/Node.h

@@public:

    // Use when it's guaranteed to that shadowParentNode is 0.

    ContainerNode* parentNodeGuaranteedHostFree() const;

    Element* shadowHost() const;

    void setShadowHost(Element*);

    // Returns the enclosing event parent node (or self) that, when clicked, would trigger a navigation.

    Node* enclosingLinkEventParentOrSelf();

@@protected:

    NodeRareData* rareData() const;

    NodeRareData* ensureRareData();

    Element* shadowHost() const;

    void setShadowHost(Element*);

private:

#if USE(JSC)

    void markCachedNodeListsSlow(JSC::MarkStack&, JSC::JSGlobalData&);