ChangeLog

2012-11-19  Takashi Sakamoto  <tasak@google.com>

        Text nodes in shadow roots don't inherit style properly

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

        Reviewed by NOBODY (OOPS!).

        Use NodeRenderingContext to solve styles of text nodes.

        If text nodes are direct chilren of shadow roots, the text nodes

        should be inherited styles from their shadow hosts.

        But if reset-style-inheritance flag is true, the text nodes should

        not be inherited. And if text nodes are distributed nodes,

        we have to check whether their insertion point's

        reset-style-inheritance.

        c.f. shadow dom spec is:

        http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#styles

        Test: fast/dom/shadow/text-node-in-shadow.html

        * css/StyleResolver.cpp:

        (WebCore::StyleResolver::styleForText):

        Use NodeRenderingContext to find the parent node for style from the

        given text node. If no parent node is found or reset-style-inheritance

        is true (i.e. the given node is a distributed node or direct child of

        a shadow root), returns an empty RenderStyle. Otherwise, just returns

        the found node's style.

        * css/StyleResolver.h:

        (StyleResolver):

        * dom/NodeRenderingContext.cpp:

        (WebCore::NodeRendererFactory::createRendererIfNeeded):

        Use styleForText's results for text nodes instead of

        parentRenderer's styles.

        * dom/Text.cpp:

        (WebCore::Text::recalcTextStyle):

2012-11-19  Kentaro Hara  <haraken@chromium.org>

        In the IDL parser, we should rename $dataNode to $interface

Source/WebCore/css/StyleResolver.cpp

@@PassRefPtr<RenderStyle> StyleResolver::styleForPage(int pageIndex)

    return m_style.release();

}

PassRefPtr<RenderStyle> StyleResolver::styleForText(Node* textNode)

{

    ASSERT(textNode);

    ASSERT(textNode->isTextNode());

    NodeRenderingContext context(textNode);

    Node* parentNode = context.parentNodeForRenderingAndStyle();

    if (!shouldResetStyleInheritance(context) && parentNode)

        return parentNode->renderStyle();

    m_style = RenderStyle::create();

    if (Settings* settings = documentSettings()) {

        initializeFontStyle(settings);

        m_style->font().update(fontSelector());

    } else

        m_style->font().update(0);

    return m_style.release();

}

static void addIntrinsicMargins(RenderStyle* style)

{

    // Intrinsic margin value.

Source/WebCore/css/StyleResolver.h

@@public:

    PassRefPtr<RenderStyle> pseudoStyleForElement(PseudoId, Element*, RenderStyle* parentStyle);

    PassRefPtr<RenderStyle> styleForPage(int pageIndex);

154 PassRefPtr<RenderStyle> styleForText(Node*);

    static PassRefPtr<RenderStyle> styleForDocument(Document*, CSSFontSelector* = 0);

Source/WebCore/dom/NodeRenderingContext.cpp

#include "RenderView.h"

#include "ShadowRoot.h"

#include "StyleInheritedData.h"

44#include "StyleResolver.h"

#if ENABLE(SVG)

#include "SVGNames.h"

@@void NodeRendererFactory::createRendererIfNeeded()

    Element* element = node->isElementNode() ? toElement(node) : 0;

    if (element)

        m_context.setStyle(element->styleForRenderer());

240 else if (node->isTextNode())

241 m_context.setStyle(document->styleResolver()->styleForText(node));

    else if (RenderObject* parentRenderer = m_context.parentRenderer())

        m_context.setStyle(parentRenderer->style());

Source/WebCore/dom/Text.cpp

#endif

#include "StyleInheritedData.h"

36#include "StyleResolver.h"

#include <wtf/text/CString.h>

#include <wtf/text/StringBuilder.h>

@@void Text::recalcTextStyle(StyleChange change)

    // The only time we have a renderer and our parent doesn't is if our parent

    // is a shadow root.

263 if (change != NoChange && renderer ~~&& !parentNode()->isShadowRoot())~~

264 renderer->setStyle(~~par~~ent~~Node~~()->r~~end~~erer()->style());

264 if (change != NoChange && renderer)

265 renderer->setStyle(document()->styleResolver()->styleForText(this));

    if (needsStyleRecalc()) {

        if (renderer) {

LayoutTests/ChangeLog

2012-11-19  Takashi Sakamoto  <tasak@google.com>

        Text nodes in shadow roots don't inherit style properly

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

        Reviewed by NOBODY (OOPS!).

        * fast/dom/shadow/text-node-in-shadow-expected.html: Added.

        * fast/dom/shadow/text-node-in-shadow.html: Added.

        Four test cases, one is for testing a text node which is a direct

        child of a shadow root without reset-style-inheritance.

        One is with reset-style-inheritance.

        One is for testing a text node which is a distributed node and its

        insertion point doesn't have reset-style-inheritance set to be true.

        The other one is almost the same as the previous one except

        reset-style-inheritance.

2012-11-19  Adam Klein  <adamk@chromium.org>

        MutationObserver wrapper should not be collected while still observing

LayoutTests/fast/dom/shadow/text-node-in-shadow-expected.html

<!doctype html>

<html>

<body>

  <div style="font-size: 5em;"><span>foo</span>bar</div>

  <div><span>foo</span>bar</span><span style="font-size: 6em;">&nbsp;</span></div>

  <div><span style="font-size: 5em;">Foo<span>Bar</span></span></div>

  <div>Foo<span>Bar</span><span style="font-size: 6em;">&nbsp;</span></div>

</body>

</html>

LayoutTests/fast/dom/shadow/text-node-in-shadow.html

<!doctype html>

<html>

<head>

<style>

span {

   text-align: top;

}

</style>

<script>

function testChildTextOfShadowRoot() {

    var host = document.getElementById("host");

    var shadowRoot = new WebKitShadowRoot(host);

    var span = document.createElement('span')

    span.textContent = "foo";

    shadowRoot.appendChild(span);

    shadowRoot.appendChild(document.createTextNode("bar"));

    document.body.offsetLeft;

    host.style.fontSize = '5em';

}

function testChildTextOfShadowRootWithResetStyleInheritance() {

    var host = document.getElementById("hostResetStyleInheritance");

    var shadowRoot = new WebKitShadowRoot(host);

    var span = document.createElement('span')

    span.textContent = "foo";

    shadowRoot.appendChild(span);

    shadowRoot.appendChild(document.createTextNode("bar"));

    shadowRoot.resetStyleInheritance = true;

    document.body.offsetLeft;

    host.style.fontSize = '6em';

}

function testDistributedText() {

    var host = document.getElementById("hostWithDistribution");

    var shadowRoot = new WebKitShadowRoot(host);

    shadowRoot.innerHTML = "<span id='span1'><content></content></span>"

    document.body.offsetLeft;

    shadowRoot.getElementById("span1").style.fontSize = '5em';

}

function testDistributedTextWithResetStyleInheritance() {

    var host = document.getElementById("hostResetStyleInheritanceWithDistribution");

    var shadowRoot = new WebKitShadowRoot(host);

    shadowRoot.innerHTML = "<span id='span2'><content id='content'></content></span>"

    shadowRoot.getElementById("content").resetStyleInheritance = true;

    document.body.offsetLeft;

    shadowRoot.getElementById("span2").style.fontSize = '6em';

}

function runTests() {

    testChildTextOfShadowRoot();

    testChildTextOfShadowRootWithResetStyleInheritance();

    testDistributedText();

    testDistributedTextWithResetStyleInheritance();

}

</script>

</head>

<body onload="runTests()">

  <!-- [bug 101116] Text nodes in shadow roots don't inherit style properly -->

  <!-- https://bugs.webkit.org/show_bug.cgi?id=101116 -->

  <div id="host"></div>

  <div id="hostResetStyleInheritance"></div>

  <div id="hostWithDistribution">Foo<span>Bar</span></div>

  <div id="hostResetStyleInheritanceWithDistribution">Foo<span>Bar</span></div>

</body>

</html>