WebCore/ChangeLog

2010-11-16  Dimitri Glazkov  <dglazkov@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Provide means to store shadow DOM nodes on Element

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

        Adds shadow DOM awareness to the standard Node attach/detach,

        document and tree insertion and removal cycle.

        No new tests, because the code is not yet used.

        * dom/Element.cpp:

        (WebCore::Element::insertedIntoDocument): Added logic to cascade down to shadow DOM, if present.

        (WebCore::Element::removedFromDocument): Ditto.

        (WebCore::Element::insertedIntoTree): Ditto.

        (WebCore::Element::removedFromTree): Ditto.

        (WebCore::Element::attach): Ditto.

        (WebCore::Element::detach): Ditto.

        (WebCore::Element::recalcStyle):

        (WebCore::Element::shadowRoot): Added.

        (WebCore::Element::setShadowRoot): Added.

        (WebCore::Element::clearShadowRoot): Added.

        * dom/Element.h: Added decls.

        * dom/ElementRareData.h: Added a member to hold a RefPtr to the shadow DOM root for the element.

2010-11-16  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

WebCore/dom/Element.cpp

@@void Element::insertedIntoDocument()

    // need to do superclass processing first so inDocument() is true

    // by the time we reach updateId

    ContainerNode::insertedIntoDocument();

859 if (Node* shadow = shadowRoot())

860 shadow->insertedIntoDocument();

    if (hasID()) {

        if (m_attributeMap) {

@@void Element::removedFromDocument()

    }

    ContainerNode::removedFromDocument();

    if (Node* shadow = shadowRoot())

        shadow->removedFromDocument();

}

void Element::insertedIntoTree(bool deep)

{

    ContainerNode::insertedIntoTree(deep);

    if (!deep)

        return;

    if (Node* shadow = shadowRoot())

        shadow->insertedIntoTree(true);

}

void Element::removedFromTree(bool deep)

{

    ContainerNode::removedFromTree(deep);

    if (!deep)

        return;

    if (Node* shadow = shadowRoot())

        shadow->removedFromTree(true);

}

void Element::attach()

@@void Element::attach()

    createRendererIfNeeded();

    ContainerNode::attach();

911 if (Node* shadow = shadowRoot())

912 shadow->attach();

    if (hasRareData()) {   

        ElementRareData* data = rareData();

        if (data->needsFocusAppearanceUpdateSoonAfterAttach()) {

@@void Element::detach()

    if (hasRareData())

        rareData()->resetComputedStyle();

    ContainerNode::detach();

934 if (Node* shadow = shadowRoot())

935 shadow->detach();

    RenderWidget::resumeWidgetHierarchyUpdates();

}

@@void Element::recalcStyle(StyleChange change)

    bool hasPositionalRules = needsStyleRecalc() && currentStyle && currentStyle->childrenAffectedByPositionalRules();

    bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();

963 #if ENABLE(SVG)

964 if (!hasParentStyle && isShadowNode() && isSVGElement())

989 if (!hasParentStyle && isShadowNode())

965990 hasParentStyle = true;

966 #endif

    if ((change > NoChange || needsStyleRecalc())) {

        if (hasRareData())

@@void Element::recalcStyle(StyleChange change)

        if (n->isElementNode())

            forceCheckOfNextElementSibling = childRulesChanged && hasDirectAdjacentRules;

    }

    // FIXME: This does not care about sibling combinators. Will be necessary in XBL2 world.

    if (Node* shadow = shadowRoot()) {

        if (change >= Inherit || shadow->isTextNode() || shadow->childNeedsStyleRecalc() || shadow->needsStyleRecalc())

            shadow->recalcStyle(change);

    }

    clearNeedsStyleRecalc();

    clearChildNeedsStyleRecalc();

}

Node* Element::shadowRoot()

{

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

}

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;

}

void Element::clearShadowRoot()

{

    if (!hasRareData())

        return;

    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);

}

bool Element::childTypeAllowed(NodeType type)

{

    switch (type) {

WebCore/dom/Element.h

@@public:

    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);

    virtual void recalcStyle(StyleChange = NoChange);

    Node* shadowRoot();

    void setShadowRoot(PassRefPtr<Node>);

    void clearShadowRoot();

    RenderStyle* computedStyle(PseudoId = NOPSEUDO);

    AtomicString computeInheritedLanguage() const;

@@protected:

    virtual void insertedIntoDocument();

    virtual void removedFromDocument();

344 virtual void insertedIntoTree(bool);

345 virtual void removedFromTree(bool);

    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);

    // The implementation of Element::attributeChanged() calls the following two functions.

WebCore/ChangeLog

WebCore/dom/Element.cpp

WebCore/dom/Element.h

WebCore/dom/ElementRareData.h