struct-use-09-b.svg

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

<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny-flat.dtd">

<svg version="1.1" baseProfile="basic" id="svg-root" width="100%" height="100%" viewBox="0 0 480 360" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">

  <!--======================================================================-->

  <!--=  Copyright 2000 World Wide Web Consortium, (Massachusetts          =-->

  <!--=  Institute of Technology, Institut National de Recherche en        =-->

  <!--=  Informatique et en Automatique, Keio University). All Rights      =-->

  <!--=  Reserved. See http://www.w3.org/Consortium/Legal/.                =-->

  <!--======================================================================-->

  <!-- NOTE:  CVS will automatically update the                             -->

  <!--        "$RCSfile: struct-use-09-b.svg,v $" and "$Revision: 1.1 $"         -->

  <!--        fields in the file.                                           -->

  <!--        There is no need to update this information.                  -->

  <!-- =====================================================================-->

  <SVGTestCase xmlns="http://www.w3.org/2000/02/svg/testsuite/description/" reviewer="[reviewer]" owner="AN" desc="Tests the use element in symbol definition" status="created" version="$Revision: 1.1 $" testname="$RCSfile: struct-use-09-b.svg,v $">

    <OperatorScript>

      <Paragraph>

                This tests the use element inside a symbol definition. For the test to pass, 5 rectangles with a red stroke, nested in each other, must be rendered.

      </Paragraph>

    </OperatorScript>

  </SVGTestCase>

  <title id="test-title">$RCSfile: struct-use-09-b.svg,v $</title>

  <!--======================================================================-->

  <!--Content of Test Case follows...                  =====================-->

  <!--======================================================================-->

  <g id="test-body-content">

    <!-- put all of the actual test here -->

    <defs>

    <symbol id="rect1" overflow="visible">

      <rect x="-50" y="-50" width="100" height="100" fill="none" stroke="red" />

    </symbol>

    <symbol id="rect2" overflow="visible">

      <use xlink:href="#rect1" />

      <rect x="-52.5" y="-52.5" width="105" height="105" fill="none" stroke="red" />

    </symbol>

    <symbol id="rect3" overflow="visible">

      <use xlink:href="#rect2" />

      <rect x="-55" y="-55" width="110" height="110" fill="none" stroke="red" />

    </symbol>

    <symbol id="rect4" overflow="visible">

      <use xlink:href="#rect3" />

      <rect x="-57.5" y="-57.5" width="115" height="115" fill="none" stroke="red" />

    </symbol>

    <symbol id="rects" overflow="visible">

      <use xlink:href="#rect4" />

      <rect x="-60" y="-60" width="120" height="120" fill="none" stroke="red" />

    </symbol>

    </defs>

  	<use x="240" y="180" xlink:href="#rects" />

  </g>

  <text id="revision" x="10" y="340" font-size="40" stroke="none" fill="black">$Revision: 1.1 $</text>

  <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000"/>

	<g id="draft-watermark">

		<rect x="1" y="1" width="478" height="20" fill="red" stroke="black" stroke-width="1"/>

		<text font-family="'Arial Black', Arial, sans-serif" font-weight="bold" font-size="20" x="240" 

			text-anchor="middle" y="18" stroke-width="0.5" stroke="black" fill="white">DRAFT</text>

	</g>

</svg>

LayoutTests/svg/custom/use-nested-transform.svg

<?xml version="1.0" standalone="no"?>

<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="body" width="450" height="500" viewBox="0 0 450 500">

    <defs>

        <path id="Batik_Squiggle_Blue" fill="#6666FF" d="M172,44C137,60,31,135,11,199c-8,27,22,48,44,33

                                                         C14,306-1,332,0,356c0,14,13,42,44,27c8-4,35-25,52-41

                                                         c14-1,24-11,42-28c17,14,36,10,52-7c22,2,82-78,44-108

                                                         c-3-24-30-37-53-18c-6-2-13-1-18,1c22-35,43-82,49-105

                                                         C219,47,188,36,172,44z"/>

        <g id="Batik_Tag_Box" >

            <rect x="1" y="1" width="446" height="496" style="fill:none; stroke:black" transform="translate(-418,-467)"/>

			<use xlink:href="#Batik_Squiggle_Blue" width="27" height="28" transform="translate(-418,-467)" />

        </g> 

    </defs>

    <use xlink:href="#Batik_Tag_Box" transform="translate(418,467)"/>

</svg>

WebCore/ChangeLog

2007-03-01  Nikolas Zimmermann  <zimmermann@kde.org>

        Reviewed by NOBODY (OOPS!).

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=12936 (Master bug used to track all current use problems.)

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=12926 (transform attribute not respected in nested <use> elements)

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=12267 (getElementById broken for <use>)

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=12916 (use instance in symbol definition does not work)

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=12917 (mouseout event does not occur after scaling use instance)

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=12838 (SVG <use> DOM broken for script)

        Added test: svg/custom/use-nested-transform.svg

        Added test: svg/custom/struct-use-09-b.svg (not yet official W3C-SVG-1.1 testcase)

        Fixes test: svg/custom/use-elementInstance-event-target.svg (rectangle now turns green on first click)

        Fix all (except one) known <use> bug. The remaining bug (12630) is not crucical at all.

        dom/Element.cpp needed following tweak: set hasParentStyle to true, if there is no parentNode

        available - which happens for <use> nodes, as it's a shadow node. This fixes recalcStyle behaviour.

        Override recalcStyle() in SVGUseElement, and properly forward the call to the shadow tree root element.

        The shadow tree now receives proper style updates (without having to recreate the whole tree!).

        Override attributeChanged() in SVGUseElement and only call notifyAttributeChange if one of x/y/width/height/xlink:href

        attribute changed - otherwhise we'll end up recreating the tree for every transform/style/(non-existing-attribute) change.

        Do not override transform in nested use situations, but correctly append (right-sided) the translation of the <use> element.

        Some cosmetic fixes: don't add transform="translate(0 0)" attributes if both x/y values are null in the shadow tree.

        Factor out logic for replacing symbol/svg tags in the shadow tree, and also invoke it during expandUseElementsInShadowTree -

        otherwhise <symbol><use xlink:href="#someOtherSymbol"></symbol> the <use> gets expanded to a <symbol>. Though no one expands

        the <symbol> element - and we're end up in hitting an assertion. Avoid that.

        * dom/Element.cpp:

        (WebCore::Element::recalcStyle):

        * ksvg2/svg/SVGUseElement.cpp:

        (WebCore::SVGUseElement::attributeChanged):

        (WebCore::SVGUseElement::notifyAttributeChange):

        (WebCore::SVGUseElement::recalcStyle):

        (WebCore::SVGUseElement::buildPendingResource):

        (WebCore::SVGUseElement::buildShadowTreeForSymbolTag):

        (WebCore::SVGUseElement::alterShadowTreeForSVGTag):

        (WebCore::SVGUseElement::buildShadowTree):

        (WebCore::SVGUseElement::expandUseElementsInShadowTree):

        (WebCore::SVGUseElement::attachShadowTree):

        * ksvg2/svg/SVGUseElement.h:

2007-03-01  Alexey Proskuryakov  <ap@webkit.org>

        Reviewed by Maciej.

19926

WebCore/dom/Element.cpp

@@void Element::recalcStyle(StyleChange ch

    // ### should go away and be done in renderobject

    RenderStyle* _style = renderStyle();

    bool hasParentStyle = parentNode() ? parentNode()->renderStyle() : false;

584

#if ENABLE(SVG)

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

        hasParentStyle = true;

#endif

    if (hasParentStyle && (change >= Inherit || changed())) {

        RenderStyle *newStyle = document()->styleSelector()->styleForElement(this);

        StyleChange ch = diff(_style, newStyle);

19911

WebCore/ksvg2/svg/SVGUseElement.cpp

#include "CString.h"

#include "Document.h"

36#include "Event.h"

#include "HTMLNames.h"

#include "RenderSVGContainer.h"

#include "SVGElementInstance.h"

@@void SVGUseElement::removedFromDocument(

    m_shadowTreeRootElement = 0;

}

void SVGUseElement::attributeChanged(Attribute* attr, bool preserveDecls)

{

    // Avoid calling SVGStyledElement::attributeChanged(), as it always calls notifyAttributeChange.

    SVGElement::attributeChanged(attr, preserveDecls);

    if (!attached())

       return;

    // Only update the tree if x/y/width/height or xlink:href changed.

    if (attr->name() == SVGNames::xAttr || attr->name() == SVGNames::yAttr ||

        attr->name() == SVGNames::widthAttr || attr->name() == SVGNames::heightAttr ||

        attr->name().matches(XLinkNames::hrefAttr))

        buildPendingResource();

    else if (m_shadowTreeRootElement)

        m_shadowTreeRootElement->setChanged();

}

void SVGUseElement::notifyAttributeChange() const

{

    if (!attached())

@@void SVGUseElement::notifyAttributeChang

    // It has to be done correctly, by implementing attributeChanged().

    const_cast<SVGUseElement*>(this)->buildPendingResource();

146 if (renderer())

147 renderer()->setNeedsLayout(true);

    if (m_shadowTreeRootElement)

        m_shadowTreeRootElement->setChanged();

}

void SVGUseElement::recalcStyle(StyleChange change)

{

    SVGStyledElement::recalcStyle(change);

148171

149 SVGStyledElement::notifyAttributeChange();

    // The shadow tree root element is NOT a direct child element of us.

    // So we have to take care it receives style updates, manually.

    if (m_shadowTreeRootElement)

        m_shadowTreeRootElement->recalcStyle(change);

}

#ifdef DUMP_INSTANCE_TREE

@@void SVGUseElement::buildPendingResource

    // Setup shadow tree root node

    m_shadowTreeRootElement = new SVGGElement(SVGNames::gTag, document());

229 m_shadowTreeRootElement->setInDocument(~~true~~);

255 m_shadowTreeRootElement->setInDocument();

    m_shadowTreeRootElement->setShadowParentNode(this);

    // Spec: An additional transformation translate(x,y) is appended to the end

    // (i.e., right-side) of the transform attribute on the generated 'g', where x

    // and y represent the values of the x and y attributes on the 'use' element.

235 String transformString = String::format("translate(%f, %f)", x().value(), y().value());

236 m_shadowTreeRootElement->setAttribute(SVGNames::transformAttr, transformString);

    if (x().value() != 0.0 || y().value() != 0.0) {

        String transformString = String::format("translate(%f, %f)", x().value(), y().value());

        m_shadowTreeRootElement->setAttribute(SVGNames::transformAttr, transformString);

    }

    // Build shadow tree from instance tree

    // This also handles the special cases: <use> on <symbol>, <use> on <svg>.

@@void SVGUseElement::handleDeepUseReferen

    buildInstanceTree(target, newInstance, foundCycle);

}

365 ~~void~~ SVGUseElement::buildShadowTree(SVGElement* target, SVGElementInstance* targetInstance)

393PassRefPtr<SVGSVGElement> SVGUseElement::buildShadowTreeForSymbolTag(SVGElement* target, SVGElementInstance* targetInstance)

{

    ExceptionCode ec = 0;

    String widthString = String::number(width().value());

    String heightString = String::number(height().value());

    if (target->hasTagName(SVGNames::symbolTag)) {

        // Spec: The referenced 'symbol' and its contents are deep-cloned into the generated tree,

        // with the exception that the 'symbol' is replaced by an 'svg'. This generated 'svg' will

        // always have explicit values for attributes width and height. If attributes width and/or

        // height are provided on the 'use' element, then these attributes will be transferred to

        // the generated 'svg'. If attributes width and/or height are not specified, the generated

        // 'svg' element will use values of 100% for these attributes.

        RefPtr<SVGSVGElement> svgElement = new SVGSVGElement(SVGNames::svgTag, document());

        // Transfer all attributes from <symbol> to the new <svg> element

        *svgElement->attributes() = *target->attributes();

        // Explicitly re-set width/height values

        svgElement->setAttribute(SVGNames::widthAttr, hasAttribute(SVGNames::widthAttr) ? widthString : "100%");

        svgElement->setAttribute(SVGNames::heightAttr, hasAttribute(SVGNames::heightAttr) ? heightString : "100%");

        // Only clone symbol children, and add them to the new <svg> element

    // Spec: The referenced 'symbol' and its contents are deep-cloned into the generated tree,

    // with the exception that the 'symbol' is replaced by an 'svg'. This generated 'svg' will

    // always have explicit values for attributes width and height. If attributes width and/or

    // height are provided on the 'use' element, then these attributes will be transferred to

    // the generated 'svg'. If attributes width and/or height are not specified, the generated

    // 'svg' element will use values of 100% for these attributes.

    RefPtr<SVGSVGElement> svgElement = new SVGSVGElement(SVGNames::svgTag, document());

    // Transfer all attributes from <symbol> to the new <svg> element

    *svgElement->attributes() = *target->attributes();

    // Explicitly re-set width/height values

    svgElement->setAttribute(SVGNames::widthAttr, hasAttribute(SVGNames::widthAttr) ? widthString : "100%");

    svgElement->setAttribute(SVGNames::heightAttr, hasAttribute(SVGNames::heightAttr) ? heightString : "100%");

    // Only clone symbol children, and add them to the new <svg> element    

    if (targetInstance) {

        // Called from buildShadowTree()

        for (SVGElementInstance* instance = targetInstance->firstChild(); instance; instance = instance->nextSibling()) {

            RefPtr<Node> newChild = instance->correspondingElement()->cloneNode(true);

            svgElement->appendChild(newChild.release(), ec);

            ASSERT(ec == 0);

        }

    } else {

        // Called from expandUseElementsInShadowTree()

        for (Node* child = target->firstChild(); child; child = child->nextSibling()) {

            RefPtr<Node> newChild = child->cloneNode(true);

            svgElement->appendChild(newChild.release(), ec);

            ASSERT(ec == 0);

        }

    }

394431

395 ~~m_shadowTreeRootElement->appendChild(~~svgElement~~.release(), ec)~~;

396 ~~ASSERT(ec == 0);~~

432 return svgElement;

433}

397434

398 return;

399 }

void SVGUseElement::alterShadowTreeForSVGTag(SVGElement* target)

{

    String widthString = String::number(width().value());

    String heightString = String::number(height().value());

    if (hasAttribute(SVGNames::widthAttr))

        target->setAttribute(SVGNames::widthAttr, widthString);

    if (hasAttribute(SVGNames::heightAttr))

        target->setAttribute(SVGNames::heightAttr, heightString);

}

void SVGUseElement::buildShadowTree(SVGElement* target, SVGElementInstance* targetInstance)

{

    ExceptionCode ec = 0;

400450

401 // For all other target types, we just need to clone the whole referenced subtree.

402 RefPtr<Node> newChild = targetInstance->correspondingElement()->cloneNode(true);

    RefPtr<Node> newChild;

    // Handle use referencing <symbol> special case

    if (target->hasTagName(SVGNames::symbolTag))

        newChild = buildShadowTreeForSymbolTag(target, targetInstance);

    else

        newChild = targetInstance->correspondingElement()->cloneNode(true);

    SVGElement* newChildPtr = svg_dynamic_cast(newChild.get());

    ASSERT(newChildPtr);

@@void SVGUseElement::buildShadowTree(SVGE

    ASSERT(ec == 0);

    // Handle use referencing <svg> special case

    if (target->hasTagName(SVGNames::svgTag)) {

        ASSERT(newChildPtr->hasTagName(SVGNames::svgTag));

        if (hasAttribute(SVGNames::widthAttr))

            newChildPtr->setAttribute(SVGNames::widthAttr, widthString);

        if (hasAttribute(SVGNames::heightAttr))

            newChildPtr->setAttribute(SVGNames::heightAttr, heightString);

    }

466 if (target->hasTagName(SVGNames::svgTag))

467 alterShadowTreeForSVGTag(newChildPtr);

}

void SVGUseElement::expandUseElementsInShadowTree(Node* element)

@@void SVGUseElement::expandUseElementsInS

        // Don't ASSERT(target) here, it may be "pending", too.

        if (target) {

            ExceptionCode ec = 0;

            // Clone whole target sub-tree

            RefPtr<Node> clone = target->cloneNode(true);

            // Setup sub-shadow tree root node

            RefPtr<SVGElement> cloneParent = new SVGGElement(SVGNames::gTag, document());

@@void SVGUseElement::expandUseElementsInS

            // Spec: An additional transformation translate(x,y) is appended to the end

            // (i.e., right-side) of the transform attribute on the generated 'g', where x

            // and y represent the values of the x and y attributes on the 'use' element. 

            String transformString = String::format("translate(%f, %f)", use->x().value(), use->y().value());

            cloneParent->setAttribute(SVGNames::transformAttr, transformString);

            // and y represent the values of the x and y attributes on the 'use' element.

            if (use->x().value() != 0.0 || use->y().value() != 0.0) {

                if (!cloneParent->hasAttribute(SVGNames::transformAttr)) {

                    String transformString = String::format("translate(%f, %f)", use->x().value(), use->y().value());

                    cloneParent->setAttribute(SVGNames::transformAttr, transformString);

                } else {

                    String transformString = String::format(" translate(%f, %f)", use->x().value(), use->y().value());

                    const AtomicString& transformAttribute = cloneParent->getAttribute(SVGNames::transformAttr);

                    cloneParent->setAttribute(SVGNames::transformAttr, transformAttribute + transformString); 

                }

            }

            RefPtr<Node> newChild;

457510

458 cloneParent->appendChild(clone.release(), ec);

            // Handle use referencing <symbol> special case

            if (target->hasTagName(SVGNames::symbolTag))

                newChild = buildShadowTreeForSymbolTag(target, 0);

            else

                newChild = target->cloneNode(true);

            SVGElement* newChildPtr = svg_dynamic_cast(newChild.get());

            ASSERT(newChildPtr);

            ExceptionCode ec = 0;

            cloneParent->appendChild(newChild.release(), ec);

            ASSERT(ec == 0);

            // Replace <use> with referenced content.

@@void SVGUseElement::expandUseElementsInS

            use->parentNode()->replaceChild(cloneParent.release(), use, ec);

            ASSERT(ec == 0);

            // Handle use referencing <svg> special case

            if (target->hasTagName(SVGNames::svgTag))

                alterShadowTreeForSVGTag(newChildPtr);

            // Immediately stop here, and restart expanding.

            expandUseElementsInShadowTree(m_shadowTreeRootElement.get());

            return;

@@void SVGUseElement::expandUseElementsInS

void SVGUseElement::attachShadowTree()

{

478 if (!m_shadowTreeRootElement || !document()->shouldCreateRenderers() || !attached() || !renderer())

545 if (!m_shadowTreeRootElement || m_shadowTreeRootElement->attached() || !document()->shouldCreateRenderers() || !attached() || !renderer())

479546 return;

480547

    if (m_shadowTreeRootElement->attached())

        m_shadowTreeRootElement->detach();

    // Inspired by RenderTextControl::createSubtreeIfNeeded(). 

    if (renderer()->canHaveChildren() && childShouldCreateRenderer(m_shadowTreeRootElement.get())) {

        RenderStyle* style = m_shadowTreeRootElement->styleForRenderer(renderer());

        if (m_shadowTreeRootElement->rendererIsNeeded(style)) {

            m_shadowTreeRootElement->setRenderer(m_shadowTreeRootElement->createRenderer(document()->renderArena(), style));

            if (m_shadowTreeRootElement->renderer()) {

                m_shadowTreeRootElement->renderer()->setStyle(style);

                renderer()->addChild(m_shadowTreeRootElement->renderer(), m_shadowTreeRootElement->nextRenderer());

            if (RenderObject* shadowRenderer = m_shadowTreeRootElement->renderer()) {

                shadowRenderer->setStyle(style);

                renderer()->addChild(shadowRenderer, m_shadowTreeRootElement->nextRenderer());

                // Mimic SVGStyledTransformableElement::attach() functionality

                SVGGElement* gElement = static_cast<SVGGElement*>(m_shadowTreeRootElement.get());

496 m_shadow~~TreeRootElement->r~~enderer()->setLocalTransform(gElement->localMatrix());

560 shadowRenderer->setLocalTransform(gElement->localMatrix());

                m_shadowTreeRootElement->setAttached();

            }

19911

LayoutTests/ChangeLog

LayoutTests/svg/custom/struct-use-09-b.svg

LayoutTests/svg/custom/use-nested-transform.svg

WebCore/ChangeLog

WebCore/dom/Element.cpp

WebCore/ksvg2/svg/SVGUseElement.cpp

WebCore/ksvg2/svg/SVGUseElement.h