ChangeLog

2012-03-04  MORITA Hajime  <morrita@google.com>

        Internally used HTMLContentElement subclasses should have correct wrapper.

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

        Reviewed by NOBODY (OOPS!).

        DetailsContentElement and DetailsSummaryElement used to use

        <div> as their tag name. But this means they are wrapped by

        wrapper objects for HTMLDivElement, which is wrong. This happened

        to work though because HTMLDivElement has no extra state or API.

        This change introduces "noConstructor" keyword for make_name.pl

        sources.  This keyword allows a tag name to specify its own

        wrapper without making the tag name visible from the parser, or

        HTMLElementFactory in precise.

        Following this addition, this change also adds a new tag name

        "webkitShadowContent" for DetailsContentElement and DetailsSummaryElement,

        which has no constructor, and whose wrapper type is HTMLElement.

        This change isn't visible from the page author and only matters for testing.

        Test: fast/dom/shadow/content-element-user-agent-shadow.html

        * dom/make_names.pl:

        (defaultTagPropertyHash):

        (buildConstructorMap):

        (printConstructors):

        (printFunctionInits):

        * html/HTMLDetailsElement.cpp:

        (WebCore::DetailsContentElement::DetailsContentElement):

        (WebCore::DetailsSummaryElement::DetailsSummaryElement):

        * html/HTMLTagNames.in:

        * html/shadow/HTMLContentElement.cpp:

        (WebCore::contentTagName):

2012-03-04  Luke Macpherson   <macpherson@chromium.org>

        Remove unused macro HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE.

Source/WebCore/dom/make_names.pl

@@sub defaultTagPropertyHash

    return (

        'constructorNeedsCreatedByParser' => 0,

        'constructorNeedsFormElement' => 0,

182 'noConstructor' => 0,

        'interfaceName' => defaultInterfaceName($_[0]),

        # By default, the JSInterfaceName is the same as the interfaceName.

        'JSInterfaceName' => defaultInterfaceName($_[0]),

@@sub buildConstructorMap

    my %tagConstructorMap = ();

    for my $tagName (keys %enabledTags) {

        my $interfaceName = $enabledTags{$tagName}{interfaceName};

328

        if ($enabledTags{$tagName}{mapToTagName}) {

            die "Cannot handle multiple mapToTagName for $tagName\n" if $enabledTags{$enabledTags{$tagName}{mapToTagName}}{mapToTagName};

            $interfaceName = $enabledTags{ $enabledTags{$tagName}{mapToTagName} }{interfaceName};

@@sub printConstructors

        # Ignore the mapped tag

        # FIXME: It could be moved inside this loop but was split for readibility.

        next if (defined($uniqueTags{$interfaceName}) || $enabledTags{$tagName}{mapToTagName});

        # Tags can have wrappers without constructors.

        # This is useful to make user-agent shadow elements internally testable

        # while keeping them from being avaialble in the HTML markup.

        next if $enabledTags{$tagName}{noConstructor};

        $uniqueTags{$interfaceName} = '1';

@@sub printFunctionInits

    my %tagConstructorMap = %$tagConstructorMap;

    for my $tagName (sort keys %tagConstructorMap) {

433 next if $enabledTags{$tagName}{noConstructor};

        my $conditional = $enabledTags{$tagName}{conditional};

        if ($conditional) {

Source/WebCore/html/HTMLDetailsElement.cpp

@@public:

private:

    DetailsContentElement(Document* document)

53 : HTMLContentElement(HTMLNames::~~div~~Tag, document)

53 : HTMLContentElement(HTMLNames::webkitShadowContentTag, document)

    {

    }

};

@@public:

private:

    DetailsSummaryElement(Document* document)

75 : HTMLContentElement(HTMLNames::~~div~~Tag, document)

75 : HTMLContentElement(HTMLNames::webkitShadowContentTag, document)

    {

        setSelect(summaryQuerySelector());

    }

Source/WebCore/html/HTMLTagNames.in

@@col interfaceName=HTMLTableColElement

colgroup interfaceName=HTMLTableColElement

command interfaceName=HTMLElement

content interfaceName=HTMLContentElement, conditional=SHADOW_DOM

35webkitShadowContent interfaceName=HTMLElement, noConstructor

datalist interfaceName=HTMLDataListElement, conditional=DATALIST

dd interfaceName=HTMLElement

del interfaceName=HTMLModElement

Source/WebCore/html/shadow/HTMLContentElement.cpp

@@static const QualifiedName& contentTagName()

#if ENABLE(SHADOW_DOM)

    return HTMLNames::contentTag;

#else

47 DEFINE_STATIC_LOCAL(QualifiedName, tagName, (nullAtom, "webkitShadowContent", HTMLNames::divTag.namespaceURI()));

48 return tagName;

47 return HTMLNames::webkitShadowContentTag

#endif

}

LayoutTests/ChangeLog

2012-03-04  MORITA Hajime  <morrita@google.com>

        Internally used HTMLContentElement subclasses should have correct wrapper.

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

        Reviewed by NOBODY (OOPS!).

        * fast/dom/shadow/content-element-user-agent-shadow-expected.txt: Added.

        * fast/dom/shadow/content-element-user-agent-shadow.html: Added.

        * platform/chromium-win/fast/html/details-remove-summary-1-and-click-expected.txt:

        * platform/chromium-win/fast/html/details-remove-summary-4-and-click-expected.txt:

        * platform/gtk/fast/html/details-remove-summary-1-and-click-expected.txt:

        * platform/gtk/fast/html/details-remove-summary-4-and-click-expected.txt:

        * platform/mac/fast/html/details-remove-summary-1-and-click-expected.txt:

        * platform/mac/fast/html/details-remove-summary-4-and-click-expected.txt:

        * platform/qt/fast/html/details-remove-summary-1-and-click-expected.txt:

        * platform/qt/fast/html/details-remove-summary-4-and-click-expected.txt:

2012-03-04  Shinya Kawanaka  <shinyak@chromium.org>

        Refactoring: Methods like firstRendererOf of NodeRenderingContext should be extracted.

LayoutTests/fast/dom/shadow/content-element-user-agent-shadow-expected.txt

PASS parsedElementShouldBeUnknown.tagName is expectedTagName

PASS 0 < parsedElementShouldBeUnknown.constructor.toString().indexOf('HTMLUnknownElement') is true

PASS contentInuserAgentShadow.tagName is expectedTagName

PASS 0 < contentInuserAgentShadow.constructor.toString().indexOf('HTMLElement') is true

PASS successfullyParsed is true

TEST COMPLETE

LayoutTests/fast/dom/shadow/content-element-user-agent-shadow.html

<!DOCTYPE html>

<html>

<body>

<div id="container"></div>

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

<script><!--

(function()

{

    if (!window.internals)

        return;

    // Parser should build HTMLUnknownElement for <webkitShadowContent>.

    expectedTagName = "WEBKITSHADOWCONTENT";

    container = document.getElementById("container");

    container.innerHTML = "<div><webkitShadowContent id='shouldBeUnknown'></webkitShadowContent></div>";

    parsedElementShouldBeUnknown = document.getElementById("shouldBeUnknown");

    shouldBe("parsedElementShouldBeUnknown.tagName", "expectedTagName");

    shouldBeTrue("0 < parsedElementShouldBeUnknown.constructor.toString().indexOf('HTMLUnknownElement')");

    container.innerHTML = "<details id='details'><summary></summary></details>";

    details = document.getElementById("details");

    // The user agent shadow for <details> has HTMLContentElement with tagName "webkitShadowContent".

    // This element should be wrapped as an HTMLElement because it isn't HTMLUnknownElement and

    // HTMLContentElement wrapper is unavailable unless SHADOW_DOM is enabled.

    shadow = internals.shadowRoot(details);

    contentInuserAgentShadow = shadow.firstChild;

    shouldBe("contentInuserAgentShadow.tagName", "expectedTagName");

    shouldBeTrue("0 < contentInuserAgentShadow.constructor.toString().indexOf('HTMLElement')");

})();

--></script>

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

</body>

</html>

LayoutTests/platform/chromium-win/fast/html/details-remove-summary-1-and-click-expected.txt

@@layer at (0,0) size 800x600

          RenderDetailsMarker {DIV} at (0,5) size 10x10: down

          RenderText {#text} at (16,0) size 41x19

            text run at (16,0) width 41: "Details"