Source/core/svg/SVGSVGElement.cpp - Issue 26390004: Rework SVG sizing

Unified Diff: Source/core/svg/SVGSVGElement.cpp

Issue 26390004: Rework SVG sizing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix test that was disabled on linux and stand alone svg in error mode Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: Source/core/svg/SVGSVGElement.cpp

diff --git a/Source/core/svg/SVGSVGElement.cpp b/Source/core/svg/SVGSVGElement.cpp

index 615d4c859d730632b7cafd58883ac7cf112f2864..6032a5325fdaddc4a6c2955ba83916a3b270d0f6 100644

--- a/Source/core/svg/SVGSVGElement.cpp

+++ b/Source/core/svg/SVGSVGElement.cpp

@@ -282,6 +282,30 @@ void SVGSVGElement::parseAttribute(const QualifiedName& name, const AtomicString

reportAttributeParsingError(parseError, name, value);

}

+bool SVGSVGElement::isPresentationAttribute(const QualifiedName& name) const

+ if (isOutermostSVGSVGElement() && (name == SVGNames::widthAttr || name == SVGNames::heightAttr))

+ return true;

+ return SVGGraphicsElement::isPresentationAttribute(name);

+void SVGSVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)

+ const bool outermost = isOutermostSVGSVGElement();

+ if (outermost && (name == SVGNames::widthAttr || name == SVGNames::heightAttr)) {

pdr. 2014/04/16 18:17:04 May be cleaner just to move outermost in: if (isOu

davve 2014/04/17 11:39:22 Will do.

+ RefPtr<SVGLength> length = SVGLength::create(LengthModeOther);

+ length->setValueAsString(value, IGNORE_EXCEPTION);

+ if (length->unitType() != LengthTypeUnknown) {

+ if (name == SVGNames::widthAttr)

+ addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, value);

+ else if (name == SVGNames::heightAttr)

+ addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, value);

+ }

+ } else {

+ SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);

+ }

void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName)

{

bool updateRelativeLengthsOrViewBox = false;

@@ -303,6 +327,11 @@ void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName)

}

+ if (widthChanged || attrName == SVGNames::heightAttr) {

pdr. 2014/04/16 18:17:04 Do you need to check isSVGRoot here?

davve 2014/04/17 11:39:22 Shuffling stuff around here led me to discover a r

+ invalidateSVGPresentationAttributeStyle();

+ setNeedsStyleRecalc(LocalStyleChange);

+ }

if (SVGFitToViewBox::isKnownAttribute(attrName)) {

updateRelativeLengthsOrViewBox = true;

if (RenderObject* object = renderer())

@@ -617,22 +646,18 @@ FloatRect SVGSVGElement::currentViewBoxRect() const

if (!toRenderSVGRoot(renderer())->isEmbeddedThroughSVGImage())

return FloatRect();

- Length intrinsicWidth = this->intrinsicWidth();

- Length intrinsicHeight = this->intrinsicHeight();

- if (!intrinsicWidth.isFixed() || !intrinsicHeight.isFixed())

- return FloatRect();

// If no viewBox is specified but non-relative width/height values, then we

// should always synthesize a viewBox if we're embedded through a SVGImage.

- return FloatRect(FloatPoint(), FloatSize(floatValueForLength(intrinsicWidth, 0), floatValueForLength(intrinsicHeight, 0)));

+ return FloatRect(FloatPoint(), FloatSize(floatValueForLength(intrinsicWidth(), 0), floatValueForLength(intrinsicHeight(), 0)));

}

FloatSize SVGSVGElement::currentViewportSize() const

{

- Length intrinsicWidth = this->intrinsicWidth();

- Length intrinsicHeight = this->intrinsicHeight();

- if (intrinsicWidth.isFixed() && intrinsicHeight.isFixed())

+ if (hasIntrinsicWidth() && hasIntrinsicHeight()) {

+ Length intrinsicWidth = this->intrinsicWidth();

+ Length intrinsicHeight = this->intrinsicHeight();

return FloatSize(floatValueForLength(intrinsicWidth, 0), floatValueForLength(intrinsicHeight, 0));

+ }

if (!renderer())

return FloatSize();

@@ -646,80 +671,32 @@ FloatSize SVGSVGElement::currentViewportSize() const

return FloatSize(viewportRect.width(), viewportRect.height());

}

-bool SVGSVGElement::widthAttributeEstablishesViewport() const

+bool SVGSVGElement::hasIntrinsicWidth() const

{

- if (!renderer() || renderer()->isSVGViewportContainer())

- return true;

- // Spec: http://www.w3.org/TR/SVG/coords.html#ViewportSpace

- // The ‘width’ attribute on the outermost svg element establishes the viewport's width, unless the following conditions are met:

- // - the SVG content is a separately stored resource that is embedded by reference (such as the ‘object’ element in XHTML [XHTML]), or

- // the SVG content is embedded inline within a containing document;

- // - and the referencing element or containing document is styled using CSS [CSS2] or XSL [XSL];

- // - and there are CSS-compatible positioning properties ([CSS2], section 9.3) specified on the referencing element (e.g., the ‘object’ element)

- // or on the containing document's outermost svg element that are sufficient to establish the width of the viewport. Under these conditions,

- // the positioning properties establish the viewport's width.

- RenderSVGRoot* root = toRenderSVGRoot(renderer());

- // SVG embedded through object/embed/iframe.

- if (root->isEmbeddedThroughFrameContainingSVGDocument())

- return !root->hasReplacedLogicalWidth() && !document().frame()->ownerRenderer()->hasReplacedLogicalWidth();

- // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.

- if (root->isEmbeddedThroughSVGImage() || document().documentElement() != this)

- return !root->hasReplacedLogicalWidth();

- return true;

+ return width()->currentValue()->unitType() != LengthTypePercentage;

}

-bool SVGSVGElement::heightAttributeEstablishesViewport() const

+bool SVGSVGElement::hasIntrinsicHeight() const

{

- if (!renderer() || renderer()->isSVGViewportContainer())

- return true;

- // Spec: http://www.w3.org/TR/SVG/coords.html#IntrinsicSizing

- // Similarly, if there are positioning properties specified on the referencing element or on the outermost svg element

- // that are sufficient to establish the height of the viewport, then these positioning properties establish the viewport's

- // height; otherwise, the ‘height’ attribute on the outermost svg element establishes the viewport's height.

- RenderSVGRoot* root = toRenderSVGRoot(renderer());

- // SVG embedded through object/embed/iframe.

- if (root->isEmbeddedThroughFrameContainingSVGDocument())

- return !root->hasReplacedLogicalHeight() && !document().frame()->ownerRenderer()->hasReplacedLogicalHeight();

- // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.

- if (root->isEmbeddedThroughSVGImage() || document().documentElement() != this)

- return !root->hasReplacedLogicalHeight();

- return true;

+ return height()->currentValue()->unitType() != LengthTypePercentage;

}

-Length SVGSVGElement::intrinsicWidth(ConsiderCSSMode mode) const

+Length SVGSVGElement::intrinsicWidth() const

{

- if (widthAttributeEstablishesViewport() || mode == IgnoreCSSProperties) {

- if (m_width->currentValue()->unitType() == LengthTypePercentage)

- return Length(m_width->currentValue()->valueAsPercentage() * 100, Percent);

- SVGLengthContext lengthContext(this);

- return Length(m_width->currentValue()->value(lengthContext), Fixed);

- }

+ if (width()->currentValue()->unitType() == LengthTypePercentage)

+ return Length(0, Fixed);

- ASSERT(renderer());

- return renderer()->style()->width();

+ SVGLengthContext lengthContext(this);

+ return Length(width()->currentValue()->value(lengthContext), Fixed);

}

-Length SVGSVGElement::intrinsicHeight(ConsiderCSSMode mode) const

+Length SVGSVGElement::intrinsicHeight() const

{

- if (heightAttributeEstablishesViewport() || mode == IgnoreCSSProperties) {

- if (m_height->currentValue()->unitType() == LengthTypePercentage)

- return Length(m_height->currentValue()->valueAsPercentage() * 100, Percent);

- SVGLengthContext lengthContext(this);

- return Length(m_height->currentValue()->value(lengthContext), Fixed);

- }

+ if (height()->currentValue()->unitType() == LengthTypePercentage)

+ return Length(0, Fixed);

- ASSERT(renderer());

- return renderer()->style()->height();

+ SVGLengthContext lengthContext(this);

+ return Length(height()->currentValue()->value(lengthContext), Fixed);

}

AffineTransform SVGSVGElement::viewBoxToViewTransform(float viewWidth, float viewHeight) const

« Source/core/css/svg.css ('K') | « Source/core/svg/SVGSVGElement.h ('k') | Source/core/svg/graphics/SVGImage.h » ('j') | no next file with comments »