ChangeLog

2013-01-11  Rafael Weinstein  <rafaelw@chromium.org>

        Template element should parse in XHTML just as it does in HTML

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

        Reviewed by NOBODY (OOPS!).

        https://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/templates/index.html#parsing-xhtml-documents.

        This patch modifies the XML parser in two ways: (1) when nodes are created, their owner document is

        the owner document of the current node, rather than the containing document, and (2) when an HTMLTemplateElement

        is encountered, its content document fragment is pushed onto the stack, rather than the element itself, so that children

        are appended to the template content.

        Tests: fast/dom/HTMLTemplateElement/xhtml-parsing-and-serialization.xml

               fast/xpath/xpath-template-element.html

               fast/xsl/xslt-processor-template.html

               fast/xsl/xslt-xhtml-template.xml

        * xml/parser/XMLDocumentParser.cpp:

        (WebCore::XMLDocumentParser::enterText):

        * xml/parser/XMLDocumentParserLibxml2.cpp:

        (WebCore::XMLDocumentParser::startElementNs):

        (WebCore::XMLDocumentParser::processingInstruction):

        (WebCore::XMLDocumentParser::cdataBlock):

        (WebCore::XMLDocumentParser::comment):

2013-01-16  Benjamin Poulain  <bpoulain@apple.com>

        Force a rebuild of RenderObject

Source/WebCore/xml/parser/XMLDocumentParser.cpp

@@void XMLDocumentParser::enterText()

    ASSERT(m_bufferedText.size() == 0);

#endif

    ASSERT(!m_leafTextNode);

149 m_leafTextNode = Text::create(document(), "");

149 m_leafTextNode = Text::create(m_currentNode->document(), "");

    m_currentNode->parserAppendChild(m_leafTextNode.get());

}

Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

#include "HTMLLinkElement.h"

#include "HTMLNames.h"

#include "HTMLStyleElement.h"

45#include "HTMLTemplateElement.h"

#include "ProcessingInstruction.h"

#include "ResourceError.h"

#include "ResourceHandle.h"

@@void XMLDocumentParser::startElementNs(const xmlChar* xmlLocalName, const xmlCha

    m_sawFirstElement = true;

    QualifiedName qName(prefix, localName, uri);

791 RefPtr<Element> newElement = document()->createElement(qName, true);

792 RefPtr<Element> newElement = m_currentNode->document()->createElement(qName, true);

    if (!newElement) {

        stopParsing();

        return;

@@void XMLDocumentParser::startElementNs(const xmlChar* xmlLocalName, const xmlCha

    m_currentNode->parserAppendChild(newElement.get());

#if ENABLE(TEMPLATE_ELEMENT)

    if (newElement->hasTagName(HTMLNames::templateTag))

        pushCurrentNode(toHTMLTemplateElement(newElement.get())->content());

    else

        pushCurrentNode(newElement.get());

#else

821828 pushCurrentNode(newElement.get());

829#endif

830

    if (m_view && !newElement->attached())

        newElement->attach();

@@void XMLDocumentParser::processingInstruction(const xmlChar* target, const xmlCh

    // ### handle exceptions

    ExceptionCode ec = 0;

964 RefPtr<ProcessingInstruction> pi = document()->createProcessingInstruction(

973 RefPtr<ProcessingInstruction> pi = m_currentNode->document()->createProcessingInstruction(

        toString(target), toString(data), ec);

    if (ec)

        return;

@@void XMLDocumentParser::cdataBlock(const xmlChar* s, int len)

    exitText();

998 RefPtr<CDATASection> newNode = CDATASection::create(document(), toString(s, len));

1007 RefPtr<CDATASection> newNode = CDATASection::create(m_currentNode->document(), toString(s, len));

    m_currentNode->parserAppendChild(newNode.get());

    if (m_view && !newNode->attached())

        newNode->attach();

@@void XMLDocumentParser::comment(const xmlChar* s)

    exitText();

1016 RefPtr<Comment> newNode = Comment::create(document(), toString(s));

1025 RefPtr<Comment> newNode = Comment::create(m_currentNode->document(), toString(s));

    m_currentNode->parserAppendChild(newNode.get());

    if (m_view && !newNode->attached())

        newNode->attach();

LayoutTests/ChangeLog

2013-01-11  Rafael Weinstein  <rafaelw@chromium.org>

        Template element should parse in XHTML just as it does in HTML

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

        Reviewed by NOBODY (OOPS!).

        * fast/dom/HTMLTemplateElement/xhtml-parsing-and-serialization-expected.txt: Added.

        * fast/dom/HTMLTemplateElement/xhtml-parsing-and-serialization.xml: Added.

        * fast/xpath/xpath-template-element-expected.txt: Added.

        * fast/xpath/xpath-template-element.html: Added.

        * fast/xsl/resources/xhtml-template.xsl: Added.

        * fast/xsl/xslt-processor-template-expected.txt: Added.

        * fast/xsl/xslt-processor-template.html: Added.

        * fast/xsl/xslt-xhtml-template-expected.txt: Added.

        * fast/xsl/xslt-xhtml-template.xml: Added.

2013-01-16  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r139853.

LayoutTests/fast/dom/HTMLTemplateElement/xhtml-parsing-and-serialization-expected.txt

This tests that content within template is lifted to the template contents when parsed as xhtml.

The template content made it through the wormhole

<template xmlns="http://www.w3.org/1999/xhtml"><div>Template content</div></template>

LayoutTests/fast/dom/HTMLTemplateElement/xhtml-parsing-and-serialization.xml

<!DOCTYPE html 

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xml:lang="en-us" xmlns="http://www.w3.org/1999/xhtml">

    <body>

        <template><div>Template content</div></template>

        <span>This tests that content within template is lifted to the template contents when parsed as xhtml.</span>

        <div id="output">

        </div>

        <div id="serialization">

        </div>

<script>

if (window.testRunner) {

    testRunner.dumpAsText();

}

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

var template = document.querySelector("template");

if (template.content.childNodes.length > template.childNodes.length)

  output.textContent = "The template content made it through the wormhole\n";

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

serialization.textContent = new XMLSerializer().serializeToString(template);

</script>

    </body>

</html>

LayoutTests/fast/xpath/xpath-template-element-expected.txt

This tests that XPath expressions do not consider (traverse into) template content

A B

PASS document.evaluate('count(//span)', test, null, XPathResult.NUMBER_TYPE, null).numberValue is 2

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/fast/xpath/xpath-template-element.html

<!DOCTYPE html>

<html>

<head>

<script src="../js/resources/js-test-pre.js"></script>

</head>

<body>

<p>This tests that XPath expressions do not consider (traverse into) template content</p>

<div id=test>

    <span>A</span>

    <span>B</span>

    <template>

        <span>C</span>

        <span>D</span>

    </template>

</div>

<div id="console"></div>

<script>

var test = document.getElementById('test');

var result = document.evaluate('count(//span)', test, null, XPathResult.NUMBER_TYPE, null);

shouldBe("document.evaluate('count(//span)', test, null, XPathResult.NUMBER_TYPE, null).numberValue", "2");

</script>

<script src="../js/resources/js-test-post.js"></script>

</body>

</html>

LayoutTests/fast/xsl/resources/xhtml-template.xsl

<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

    xmlns:xhtml="http://www.w3.org/1999/xhtml"

    xmlns="http://www.w3.org/1999/xhtml"

    xmlns:xs="http://www.w3.org/2001/XMLSchema"

    exclude-result-prefixes="xhtml xsl xs">

    <xsl:output method="xml" omit-xml-declaration="yes"/>

    <xsl:template match="xhtml:html">

        <html>

            <body>

                <template>

                    <xsl:apply-templates select="//xhtml:body/xhtml:span" />

                </template>

                <xsl:apply-templates select="//xhtml:template//xhtml:span" />

                <p>This tests that XSLT transforms can traverse into XHTML template element content when applying XSL template.

                   If the test succeeds, the transform will have swapped the position of the body spans (A and B) with the template content spans (C and D)

                   and replaced the spans with divs.</p>

<script>

if (window.testRunner)

    testRunner.dumpAsText();

function divChildTextNodes(parent) {

    var output = '';

    for (var child = parent.firstChild; child; child = child.nextSibling) {

        if (child.tagName == 'div') {

            output += child.textContent;

        }

    }

    return output;

}

var span = document.body.appendChild(document.createElement('span'));

span.textContent = 'Body divs: ' + divChildTextNodes(document.body);

span = document.body.appendChild(document.createElement('span'));

var template = document.querySelector('template');

span.textContent = ', Template content divs: ' + divChildTextNodes(template.content);

</script>

            </body>

        </html>

    </xsl:template>

    <xsl:template match="xhtml:span">

        <div><xsl:value-of select="text()" /></div>

    </xsl:template>

</xsl:stylesheet>

LayoutTests/fast/xsl/xslt-processor-template-expected.txt

This tests that XSLT transforms can traverse into XHTML template element content when applying XSL template. If the test succeeds, the transform will have swapped the position of the body spans (A and B) with the template content spans (C and D) and replaced the spans with divs.

Body divs: CD, Template content divs: AB

LayoutTests/fast/xsl/xslt-processor-template.html

<html>

<head>

</head>

<body id="body">

<p>This tests that XSLT transforms can traverse into XHTML template element content when applying XSL template.

If the test succeeds, the transform will have swapped the position of the body spans (A and B) with the template content spans (C and D)

and replaced the spans with divs.</p>

<script>

if (window.testRunner)

	testRunner.dumpAsText();

var requester = new XMLHttpRequest();

var processor = new XSLTProcessor();

var serializer = new XMLSerializer();

function getXMLDocument(name)

{

	requester.open("GET", name, false);

	requester.send(null);

	return requester.responseXML;

}

function addStringResult(text)

{

	document.writeln("<span>" + text + "</span>");

}

function divChildTextNodes(parent) {

    var output = '';

    for (var child = parent.firstChild; child; child = child.nextSibling) {

        if (child.tagName == 'div') {

            output += child.textContent;

        }

    }

    return output;

}

var xml = getXMLDocument("xslt-xhtml-template.xml");

var xsl = getXMLDocument("resources/xhtml-template.xsl");

processor.importStylesheet(xsl);

var ownerDocument = document.implementation.createDocument("", "test", null);

var frag = processor.transformToFragment(xml, ownerDocument);

addStringResult('Body divs: ' + divChildTextNodes(frag.querySelector('body')) + 

                ', Template content divs: ' + divChildTextNodes(frag.querySelector('template').content));

</script>

</body>

</html>

LayoutTests/fast/xsl/xslt-xhtml-template-expected.txt

C

D

This tests that XSLT transforms can traverse into XHTML template element content when applying XSL template. If the test succeeds, the transform will have swapped the position of the body spans (A and B) with the template content spans (C and D) and replaced the spans with divs.

Body divs: CD, Template content divs: AB

LayoutTests/fast/xsl/xslt-xhtml-template.xml

<?xml version="1.0" encoding="utf-8"?>

<?xml-stylesheet href="resources/xhtml-template.xsl" type="text/xsl"?>

<!DOCTYPE html 

     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xml:lang="en-us" xmlns="http://www.w3.org/1999/xhtml">

    <body>

        <span>A</span>

        <span>B</span>

        <template>

            <span>C</span>

            <span>D</span>

        </template>

    </body>

</html>

LayoutTests/platform/gtk/TestExpectations

@@http/tests/xmlhttprequest/default-content-type-dashboard.html [ WontFix ]

fast/css/draggable-region-parser.html [ WontFix ]

# ENABLE(TEMPLATE_ELEMENT) is disabled.

91 webkit.org/b/10357 fast/dom/HTMLTemplateElement [ Skip ]

92 webkit.org/b/10357 html5lib/run-template.html [ Skip ]

webkit.org/b/103547 fast/dom/HTMLTemplateElement [ Skip ]

webkit.org/b/103547 html5lib/run-template.html [ Skip ]

webkit.org/b/103547 fast/xsl/xslt-xhtml-template.xml [ Skip ]

webkit.org/b/103547 fast/xpath/xpath-template-element.html [ Skip ]

webkit.org/b/103547 fast/xsl/xslt-processor-template.html [ Skip ]

# These test -apple- and -khtml- prefixed CSS properties, which we don't support.

inspector/styles/vendor-prefixes.html [ WontFix ]

LayoutTests/platform/mac/TestExpectations

@@accessibility/corresponding-control-deleted-crash.html

# ENABLE(TEMPLATE_ELEMENT) is disabled.

fast/dom/HTMLTemplateElement

html5lib/run-template.html

fast/xsl/xslt-xhtml-template.xml

fast/xpath/xpath-template-element.html

fast/xsl/xslt-processor-template.html

# JSC does not support setIsolatedWorldSecurityOrigin (http://webkit.org/b/61540)

http/tests/security/isolatedWorld/cross-origin-xhr.html

LayoutTests/platform/qt/TestExpectations

@@fast/css/cursor-parsing-image-set.html

# ENABLE(TEMPLATE_ELEMENT) is disabled.

fast/dom/HTMLTemplateElement

html5lib/run-template.html

fast/xsl/xslt-xhtml-template.xml

fast/xpath/xpath-template-element.html

fast/xsl/xslt-processor-template.html

# Fail until SUBPIXEL_LAYOUT is enabled

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

LayoutTests/platform/win/TestExpectations

@@fast/dom/shadow

# ENABLE(TEMPLATE_ELEMENT) is disabled.

fast/dom/HTMLTemplateElement

html5lib/run-template.html

fast/xsl/xslt-xhtml-template.xml

fast/xpath/xpath-template-element.html

fast/xsl/xslt-processor-template.html

# CSS Regions support not yet enabled. http://webkit.org/b/57312

fast/regions

LayoutTests/platform/wincairo/TestExpectations

@@fast/dom/shadow

# ENABLE(TEMPLATE_ELEMENT) is disabled.

fast/dom/HTMLTemplateElement

html5lib/run-template.html

fast/xsl/xslt-xhtml-template.xml

fast/xpath/xpath-template-element.html

fast/xsl/xslt-processor-template.html

# CSS Regions support not yet enabled. http://webkit.org/b/57312

fast/regions