Changeset 168350 in webkit


Ignore:
Timestamp:
May 5, 2014 11:06:28 PM (10 years ago)
Author:
krit@webkit.org
Message:

Adapt inline SVG sizing behavior to Firefox and Blink
https://bugs.webkit.org/show_bug.cgi?id=132569

Reviewed by Dean Jackson.

Source/WebCore:
This patch is ported from Blink CR 308992. Thanks to David Vest for helping
with back porting his Blink patch. From the commit message:

"The basis of this change is to map explicit width and height
attributes to CSS properties, essentially promoting them to
presentation attributes. Note that implicit "100%" width and height
are not mapped.

This enables us to remove the concept of "percentage intrinsic size"
and rely on normal CSS rules to resolve percentage values.

The change has been approved by the SVG WG and the spec is being
updated. Minutes here:

http://www.w3.org/2014/04/07-svg-minutes.html#item03"

The new model was indeed approved by the SVG WG and is basically following
the CSS 2.1 model for replaced elements.

With this patch WebKit, Firefox and Blink have the same behavior for inline SVG.
This is the first successful approach to unify the sizing behavior of SVG
across UAs.

Tests: svg/as-object/sizing/svg-in-object-placeholder-height-auto.html

svg/as-object/sizing/svg-in-object-placeholder-height-fixed.html
svg/as-object/sizing/svg-in-object-placeholder-height-percentage.html
svg/in-html/sizing/svg-inline.html

  • css/svg.css: Root SVG elements still need to be sized with height: 100% and

width: 100%. This is necessary since width and height are presentation
attributes now.

(svg:root):

  • rendering/RenderBox.h:

(WebCore::RenderBox::computeIntrinsicRatioInformation): Remove all special

behavior for intrinsic and percentage based sizes in SVG. This simplifies and
unifies the code a lot. Most of the logic that is used is in RenderBox and
RenderReplaced now. RenderSVGRoot was cleaned up a lot and is much lighter.
And so it SVGSVGElement.

  • rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight):
(WebCore::RenderBoxModelObject::calculateImageIntrinsicDimensions):

  • rendering/RenderImage.cpp:

(WebCore::RenderImage::computeIntrinsicRatioInformation):

  • rendering/RenderImage.h:
  • rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computeAspectRatioInformationForRenderBox):
(WebCore::RenderReplaced::computeIntrinsicRatioInformation):
(WebCore::RenderReplaced::computeReplacedLogicalWidth):
(WebCore::RenderReplaced::computeReplacedLogicalHeight):
(WebCore::RenderReplaced::computePreferredLogicalWidths):

  • rendering/RenderReplaced.h:
  • rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::computeIntrinsicRatioInformation):
(WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
(WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
(WebCore::RenderSVGRoot::hasRelativeDimensions):
(WebCore::RenderSVGRoot::hasRelativeIntrinsicLogicalWidth): Deleted.
(WebCore::RenderSVGRoot::hasRelativeLogicalHeight): Deleted.

  • rendering/svg/RenderSVGRoot.h:
  • svg/SVGElement.h:

(WebCore::SVGElement::invalidateSVGPresentationAttributeStyle):

  • svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::isPresentationAttribute):
(WebCore::SVGSVGElement::collectStyleForPresentationAttribute):
(WebCore::SVGSVGElement::svgAttributeChanged):
(WebCore::SVGSVGElement::currentViewportSize):
(WebCore::SVGSVGElement::hasIntrinsicWidth):
(WebCore::SVGSVGElement::hasIntrinsicHeight):
(WebCore::SVGSVGElement::intrinsicWidth):
(WebCore::SVGSVGElement::intrinsicHeight):
(WebCore::SVGSVGElement::widthAttributeEstablishesViewport): Deleted.
(WebCore::SVGSVGElement::heightAttributeEstablishesViewport): Deleted.

  • svg/SVGSVGElement.h:
  • svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::containerSize):

  • xml/XMLErrors.cpp: If an error occurs in a stand alone SVG file, we create

an XHTML document with the error message and append the SVG file.
This SVG file now follows the CSS sizing behavior as inline SVG.
Therefore, we need to set width and height to 100% explicitly.

(WebCore::XMLErrors::insertErrorMessageBlock):

LayoutTests:
The new sizing behavior for inline SVG causes different DRT outputs for about 40 test cases.
This is expected but for most tests an improvement since the SVGs fit into the documents
and scrollbars disappear or the general size gets smaller.
Some tests needed to be updated. The size was either not set at all or not properly.

svg-in-object.js and svg-inline.js contain dozens of new tests to check the correct sizing
behavior.

The tests were written by David Vest from Opera as part of CR 308992.

Many of the -expected updates are caused by SVG size changes in turn
affecting where line breaks are inserted.

  • TestExpectations:
  • accessibility/svg-image-expected.txt:
  • css3/flexbox/flexitem.html:
  • fast/css/infinite-floating-value-expected.txt:
  • fast/css/remove-fixed-resizer-crash-expected.txt:
  • fast/css3-text/css3-word-spacing-percentage/word-spacing-crash-expected.txt:
  • fast/repaint/moving-shadow-on-container.html:
  • fast/repaint/moving-shadow-on-path.html:
  • fast/repaint/svg-layout-root-style-attr-update.html:
  • fast/shapes/shape-outside-floats/shape-outside-relative-size-svg-expected.html:
  • fast/shapes/shape-outside-floats/shape-outside-relative-size-svg.html:
  • http/tests/xmlviewer/dumpAsText/svg-expected.txt:
  • platform/mac/svg/batik/filters/feTile-expected.txt:
  • platform/mac/svg/batik/masking/maskRegions-expected.txt:
  • platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.txt:
  • platform/mac/svg/batik/text/longTextOnPath-expected.txt:
  • platform/mac/svg/batik/text/textDecoration-expected.txt:
  • platform/mac/svg/batik/text/textEffect-expected.txt:
  • platform/mac/svg/batik/text/textLength-expected.txt:
  • platform/mac/svg/batik/text/textOnPath-expected.txt:
  • platform/mac/svg/batik/text/textPosition-expected.txt:
  • platform/mac/svg/batik/text/verticalText-expected.txt:
  • platform/mac/svg/batik/text/verticalTextOnPath-expected.txt:
  • platform/mac/svg/custom/bug45331-expected.txt:
  • platform/mac/svg/custom/junk-data-expected.txt:
  • platform/mac/svg/custom/missing-xlink-expected.txt:
  • platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
  • platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • platform/mac/svg/custom/path-bad-data-expected.txt:
  • platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
  • platform/mac/svg/custom/use-font-face-crash-expected.txt:
  • platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt:
  • platform/mac/svg/hixie/error/012-expected.txt:
  • platform/mac/svg/hixie/intrinsic/001-expected.png: Removed.
  • platform/mac/svg/hixie/intrinsic/001-expected.txt: Removed.
  • platform/mac/svg/hixie/intrinsic/002-expected.png: Removed.
  • platform/mac/svg/hixie/intrinsic/002-expected.txt: Removed.
  • platform/mac/svg/in-html/circle-expected.txt:
  • platform/mac/svg/text/non-bmp-positioning-lists-expected.txt:
  • platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt:
  • platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt:
  • platform/mac/svg/wicd/rightsizing-grid-expected.txt:
  • platform/mac/svg/wicd/test-rightsizing-b-expected.txt:
  • platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt:
  • platform/mac/svg/zoom/page/zoom-background-images-expected.txt:
  • platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
  • platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-as-relative-image-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt:
  • platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt:
  • platform/mac/svg/zoom/page/zoom-zoom-coords-expected.txt:
  • platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt:
  • svg/animations/animate-css-xml-attributeType-expected.txt:
  • svg/as-image/image-respects-deviceScaleFactor.html:
  • svg/as-image/image-respects-pageScaleFactor.html:
  • svg/as-image/svg-as-image-with-relative-size-expected.html:
  • svg/as-image/svg-as-relative-image.html:
  • svg/as-object/sizing/svg-in-object-placeholder-height-auto-expected.txt: Added.
  • svg/as-object/sizing/svg-in-object-placeholder-height-auto.html: Added.
  • svg/as-object/sizing/svg-in-object-placeholder-height-fixed-expected.txt: Added.
  • svg/as-object/sizing/svg-in-object-placeholder-height-fixed.html: Added.
  • svg/as-object/sizing/svg-in-object-placeholder-height-percentage-expected.txt: Added.
  • svg/as-object/sizing/svg-in-object-placeholder-height-percentage.html: Added.
  • svg/as-object/sizing/svg-in-object.js: Added.

(.):
(.addAttr):
(.generateSVGURI):
(buildDemo):
(.doCombinationTestRecursive):
(doCombinationTest):
(debugHint):
(.debugHint):
(testSVGInObjectWithPlaceholderHeightAttr.):
(testSVGInObjectWithPlaceholderHeightAttr):

  • svg/css/composite-shadow-example.html:
  • svg/css/composite-shadow-with-opacity.html:
  • svg/css/max-width-2.html:
  • svg/css/stars-with-shadow.html:
  • svg/custom/absolute-sized-content-with-resources.xhtml:
  • svg/custom/altglyph.svg:
  • svg/custom/document-all-includes-svg-expected.txt:
  • svg/custom/external-paintserver-reference-expected.txt:
  • svg/custom/external-paintserver-reference.svg:
  • svg/custom/get-text-element-transform-crash-expected.txt:
  • svg/custom/linking-base-external-reference-expected.txt:
  • svg/custom/linking-base-external-reference.xhtml:
  • svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • svg/custom/object-sizing-height-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
  • svg/custom/object-sizing-height-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
  • svg/custom/object-sizing-width-50p-height-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
  • svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
  • svg/custom/object-sizing-width-50p-height-75p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
  • svg/custom/object-sizing-width-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
  • svg/custom/object-sizing-width-50p-on-target-svg.xhtml: Removed.
  • svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
  • svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute.xhtml: Removed.
  • svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
  • svg/custom/object-sizing-width-75p-height-50p-on-target-svg.xhtml: Removed.
  • svg/custom/pending-resource-after-removal.xhtml:
  • svg/custom/percentage-of-html-parent.xhtml:
  • svg/custom/relative-sized-content-with-resources.xhtml:
  • svg/custom/relative-sized-content.xhtml:
  • svg/custom/relative-sized-deep-shadow-tree-content.xhtml:
  • svg/custom/relative-sized-image.xhtml:
  • svg/custom/relative-sized-inner-svg.xhtml:
  • svg/custom/relative-sized-shadow-tree-content-with-symbol.xhtml:
  • svg/custom/relative-sized-shadow-tree-content.xhtml:
  • svg/custom/relative-sized-use-on-symbol.xhtml:
  • svg/custom/relative-sized-use-without-attributes-on-symbol.xhtml:
  • svg/custom/tref-with-progress-tag-setpseudo-assert-expected.txt:
  • svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt:
  • svg/custom/use-invalid-html-expected.txt:
  • svg/custom/window-named-item-lookup-expected.txt:
  • svg/dom/SVGViewSpec-invalid-ref-crash-expected.txt:
  • svg/dom/parent-view-layout-crash-expected.txt:
  • svg/dom/stylesheet-candidate-node-crash-main-expected.txt:
  • svg/dom/svg-root-lengths.html:
  • svg/foreignObject/absolute-position-foreign-object-child-crash-expected.txt:
  • svg/hixie/intrinsic/001-expected.png: Removed.
  • svg/hixie/intrinsic/001-expected.txt: Removed.
  • svg/hixie/intrinsic/001.html: Removed.
  • svg/hixie/intrinsic/002-expected.png: Removed.
  • svg/hixie/intrinsic/002-expected.txt: Removed.
  • svg/hixie/intrinsic/002.html: Removed.
  • svg/hixie/intrinsic/resources/001.svg: Removed.
  • svg/hixie/intrinsic/resources/002.svg: Removed.
  • svg/in-html/sizing/svg-inline-expected.txt: Added.
  • svg/in-html/sizing/svg-inline.html: Added.
  • svg/in-html/sizing/svg-inline.js: Added.

(.):
(setupSVGElement):
(buildDemo):
(.doCombinationTestRecursive):
(doCombinationTest):
(debugHint):
(.debugHint):

  • svg/path-arc-invalid-expected.txt:
  • svg/repaint/repaint-webkit-svg-shadow-container-expected.txt:
  • svg/text/append-text-node-to-tspan.html:
  • svg/text/kerning.svg:
  • svg/text/modify-text-node-in-tspan.html:
  • svg/text/multichar-glyph.svg:
  • svg/text/remove-text-node-from-tspan.html:
  • svg/text/remove-tspan-from-text.html:
  • svg/text/svg-rtl-text-crash-expected.txt:
  • svg/text/text-block-child-crash-expected.txt:
  • svg/transforms/animated-path-inside-transformed-html.xhtml:
  • svg/transforms/svg-css-transforms-clip-path.xhtml:
  • svg/transforms/transform-origin-css-property.xhtml:
  • svg/zoom/page/zoom-foreignObject.svg:
  • svg/zoom/page/zoom-svg-as-relative-image.html:
  • svg/zoom/text/zoom-foreignObject.svg:
Location:
trunk
Files:
12 added
46 deleted
118 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r168349 r168350  
     12014-05-05  Dirk Schulze  <krit@webkit.org>
     2
     3        Adapt inline SVG sizing behavior to Firefox and Blink
     4        https://bugs.webkit.org/show_bug.cgi?id=132569
     5
     6        Reviewed by Dean Jackson.
     7
     8        The new sizing behavior for inline SVG causes different DRT outputs for about 40 test cases.
     9        This is expected but for most tests an improvement since the SVGs fit into the documents
     10        and scrollbars disappear or the general size gets smaller.
     11        Some tests needed to be updated. The size was either not set at all or not properly.
     12
     13        svg-in-object.js and svg-inline.js contain dozens of new tests to check the correct sizing
     14        behavior.
     15
     16        The tests were written by David Vest from Opera as part of CR 308992.
     17
     18        Many of the -expected updates are caused by SVG size changes in turn
     19        affecting where line breaks are inserted.
     20
     21        * TestExpectations:
     22        * accessibility/svg-image-expected.txt:
     23        * css3/flexbox/flexitem.html:
     24        * fast/css/infinite-floating-value-expected.txt:
     25        * fast/css/remove-fixed-resizer-crash-expected.txt:
     26        * fast/css3-text/css3-word-spacing-percentage/word-spacing-crash-expected.txt:
     27        * fast/repaint/moving-shadow-on-container.html:
     28        * fast/repaint/moving-shadow-on-path.html:
     29        * fast/repaint/svg-layout-root-style-attr-update.html:
     30        * fast/shapes/shape-outside-floats/shape-outside-relative-size-svg-expected.html:
     31        * fast/shapes/shape-outside-floats/shape-outside-relative-size-svg.html:
     32        * http/tests/xmlviewer/dumpAsText/svg-expected.txt:
     33        * platform/mac/svg/batik/filters/feTile-expected.txt:
     34        * platform/mac/svg/batik/masking/maskRegions-expected.txt:
     35        * platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.txt:
     36        * platform/mac/svg/batik/text/longTextOnPath-expected.txt:
     37        * platform/mac/svg/batik/text/textDecoration-expected.txt:
     38        * platform/mac/svg/batik/text/textEffect-expected.txt:
     39        * platform/mac/svg/batik/text/textLength-expected.txt:
     40        * platform/mac/svg/batik/text/textOnPath-expected.txt:
     41        * platform/mac/svg/batik/text/textPosition-expected.txt:
     42        * platform/mac/svg/batik/text/verticalText-expected.txt:
     43        * platform/mac/svg/batik/text/verticalTextOnPath-expected.txt:
     44        * platform/mac/svg/custom/bug45331-expected.txt:
     45        * platform/mac/svg/custom/junk-data-expected.txt:
     46        * platform/mac/svg/custom/missing-xlink-expected.txt:
     47        * platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.png: Removed.
     48        * platform/mac/svg/custom/object-sizing-height-50p-on-target-svg-expected.png: Removed.
     49        * platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.png: Removed.
     50        * platform/mac/svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.png: Removed.
     51        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.png: Removed.
     52        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     53        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.png: Removed.
     54        * platform/mac/svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     55        * platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.png: Removed.
     56        * platform/mac/svg/custom/object-sizing-width-50p-on-target-svg-expected.png: Removed.
     57        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.png: Removed.
     58        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.png: Removed.
     59        * platform/mac/svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     60        * platform/mac/svg/custom/path-bad-data-expected.txt:
     61        * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
     62        * platform/mac/svg/custom/use-font-face-crash-expected.txt:
     63        * platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt:
     64        * platform/mac/svg/hixie/error/012-expected.txt:
     65        * platform/mac/svg/hixie/intrinsic/001-expected.png: Removed.
     66        * platform/mac/svg/hixie/intrinsic/001-expected.txt: Removed.
     67        * platform/mac/svg/hixie/intrinsic/002-expected.png: Removed.
     68        * platform/mac/svg/hixie/intrinsic/002-expected.txt: Removed.
     69        * platform/mac/svg/in-html/circle-expected.txt:
     70        * platform/mac/svg/text/non-bmp-positioning-lists-expected.txt:
     71        * platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt:
     72        * platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt:
     73        * platform/mac/svg/wicd/rightsizing-grid-expected.txt:
     74        * platform/mac/svg/wicd/test-rightsizing-b-expected.txt:
     75        * platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt:
     76        * platform/mac/svg/zoom/page/zoom-background-images-expected.txt:
     77        * platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
     78        * platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt:
     79        * platform/mac/svg/zoom/page/zoom-svg-as-relative-image-expected.txt:
     80        * platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.txt:
     81        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt:
     82        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt:
     83        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt:
     84        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt:
     85        * platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt:
     86        * platform/mac/svg/zoom/page/zoom-zoom-coords-expected.txt:
     87        * platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt:
     88        * svg/animations/animate-css-xml-attributeType-expected.txt:
     89        * svg/as-image/image-respects-deviceScaleFactor.html:
     90        * svg/as-image/image-respects-pageScaleFactor.html:
     91        * svg/as-image/svg-as-image-with-relative-size-expected.html:
     92        * svg/as-image/svg-as-relative-image.html:
     93        * svg/as-object/sizing/svg-in-object-placeholder-height-auto-expected.txt: Added.
     94        * svg/as-object/sizing/svg-in-object-placeholder-height-auto.html: Added.
     95        * svg/as-object/sizing/svg-in-object-placeholder-height-fixed-expected.txt: Added.
     96        * svg/as-object/sizing/svg-in-object-placeholder-height-fixed.html: Added.
     97        * svg/as-object/sizing/svg-in-object-placeholder-height-percentage-expected.txt: Added.
     98        * svg/as-object/sizing/svg-in-object-placeholder-height-percentage.html: Added.
     99        * svg/as-object/sizing/svg-in-object.js: Added.
     100        (.):
     101        (.addAttr):
     102        (.generateSVGURI):
     103        (buildDemo):
     104        (.doCombinationTestRecursive):
     105        (doCombinationTest):
     106        (debugHint):
     107        (.debugHint):
     108        (testSVGInObjectWithPlaceholderHeightAttr.):
     109        (testSVGInObjectWithPlaceholderHeightAttr):
     110        * svg/css/composite-shadow-example.html:
     111        * svg/css/composite-shadow-with-opacity.html:
     112        * svg/css/max-width-2.html:
     113        * svg/css/stars-with-shadow.html:
     114        * svg/custom/absolute-sized-content-with-resources.xhtml:
     115        * svg/custom/altglyph.svg:
     116        * svg/custom/document-all-includes-svg-expected.txt:
     117        * svg/custom/external-paintserver-reference-expected.txt:
     118        * svg/custom/external-paintserver-reference.svg:
     119        * svg/custom/get-text-element-transform-crash-expected.txt:
     120        * svg/custom/linking-base-external-reference-expected.txt:
     121        * svg/custom/linking-base-external-reference.xhtml:
     122        * svg/custom/object-sizing-height-50p-on-target-svg-absolute-expected.txt: Removed.
     123        * svg/custom/object-sizing-height-50p-on-target-svg-absolute.xhtml: Removed.
     124        * svg/custom/object-sizing-height-50p-on-target-svg-expected.txt: Removed.
     125        * svg/custom/object-sizing-height-50p-on-target-svg.xhtml: Removed.
     126        * svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     127        * svg/custom/object-sizing-width-50p-height-50p-on-target-svg-absolute.xhtml: Removed.
     128        * svg/custom/object-sizing-width-50p-height-50p-on-target-svg-expected.txt: Removed.
     129        * svg/custom/object-sizing-width-50p-height-50p-on-target-svg.xhtml: Removed.
     130        * svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute-expected.txt: Removed.
     131        * svg/custom/object-sizing-width-50p-height-75p-on-target-svg-absolute.xhtml: Removed.
     132        * svg/custom/object-sizing-width-50p-height-75p-on-target-svg-expected.txt: Removed.
     133        * svg/custom/object-sizing-width-50p-height-75p-on-target-svg.xhtml: Removed.
     134        * svg/custom/object-sizing-width-50p-on-target-svg-absolute-expected.txt: Removed.
     135        * svg/custom/object-sizing-width-50p-on-target-svg-absolute.xhtml: Removed.
     136        * svg/custom/object-sizing-width-50p-on-target-svg-expected.txt: Removed.
     137        * svg/custom/object-sizing-width-50p-on-target-svg.xhtml: Removed.
     138        * svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute-expected.txt: Removed.
     139        * svg/custom/object-sizing-width-75p-height-50p-on-target-svg-absolute.xhtml: Removed.
     140        * svg/custom/object-sizing-width-75p-height-50p-on-target-svg-expected.txt: Removed.
     141        * svg/custom/object-sizing-width-75p-height-50p-on-target-svg.xhtml: Removed.
     142        * svg/custom/pending-resource-after-removal.xhtml:
     143        * svg/custom/percentage-of-html-parent.xhtml:
     144        * svg/custom/relative-sized-content-with-resources.xhtml:
     145        * svg/custom/relative-sized-content.xhtml:
     146        * svg/custom/relative-sized-deep-shadow-tree-content.xhtml:
     147        * svg/custom/relative-sized-image.xhtml:
     148        * svg/custom/relative-sized-inner-svg.xhtml:
     149        * svg/custom/relative-sized-shadow-tree-content-with-symbol.xhtml:
     150        * svg/custom/relative-sized-shadow-tree-content.xhtml:
     151        * svg/custom/relative-sized-use-on-symbol.xhtml:
     152        * svg/custom/relative-sized-use-without-attributes-on-symbol.xhtml:
     153        * svg/custom/tref-with-progress-tag-setpseudo-assert-expected.txt:
     154        * svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt:
     155        * svg/custom/use-invalid-html-expected.txt:
     156        * svg/custom/window-named-item-lookup-expected.txt:
     157        * svg/dom/SVGViewSpec-invalid-ref-crash-expected.txt:
     158        * svg/dom/parent-view-layout-crash-expected.txt:
     159        * svg/dom/stylesheet-candidate-node-crash-main-expected.txt:
     160        * svg/dom/svg-root-lengths.html:
     161        * svg/foreignObject/absolute-position-foreign-object-child-crash-expected.txt:
     162        * svg/hixie/intrinsic/001-expected.png: Removed.
     163        * svg/hixie/intrinsic/001-expected.txt: Removed.
     164        * svg/hixie/intrinsic/001.html: Removed.
     165        * svg/hixie/intrinsic/002-expected.png: Removed.
     166        * svg/hixie/intrinsic/002-expected.txt: Removed.
     167        * svg/hixie/intrinsic/002.html: Removed.
     168        * svg/hixie/intrinsic/resources/001.svg: Removed.
     169        * svg/hixie/intrinsic/resources/002.svg: Removed.
     170        * svg/in-html/sizing/svg-inline-expected.txt: Added.
     171        * svg/in-html/sizing/svg-inline.html: Added.
     172        * svg/in-html/sizing/svg-inline.js: Added.
     173        (.):
     174        (setupSVGElement):
     175        (buildDemo):
     176        (.doCombinationTestRecursive):
     177        (doCombinationTest):
     178        (debugHint):
     179        (.debugHint):
     180        * svg/path-arc-invalid-expected.txt:
     181        * svg/repaint/repaint-webkit-svg-shadow-container-expected.txt:
     182        * svg/text/append-text-node-to-tspan.html:
     183        * svg/text/kerning.svg:
     184        * svg/text/modify-text-node-in-tspan.html:
     185        * svg/text/multichar-glyph.svg:
     186        * svg/text/remove-text-node-from-tspan.html:
     187        * svg/text/remove-tspan-from-text.html:
     188        * svg/text/svg-rtl-text-crash-expected.txt:
     189        * svg/text/text-block-child-crash-expected.txt:
     190        * svg/transforms/animated-path-inside-transformed-html.xhtml:
     191        * svg/transforms/svg-css-transforms-clip-path.xhtml:
     192        * svg/transforms/transform-origin-css-property.xhtml:
     193        * svg/zoom/page/zoom-foreignObject.svg:
     194        * svg/zoom/page/zoom-svg-as-relative-image.html:
     195        * svg/zoom/text/zoom-foreignObject.svg:
     196
    11972014-05-05  Ion Rosca  <rosca@adobe.com>
    2198
  • trunk/LayoutTests/TestExpectations

    r168310 r168350  
    111111webkit.org/b/132421 fast/multicol/fixed-stack.html [ ImageOnlyFailure ]
    112112
     113
     114# These tests are incorrect in the CSS test suite and should be fixed there first.
     115css2.1/20110323/replaced-intrinsic-001.htm [ Failure ]
     116css2.1/20110323/replaced-intrinsic-002.htm [ Failure ]
  • trunk/LayoutTests/accessibility/svg-image-expected.txt

    r158810 r168350  
    1 
     1 
    22This tests that SVG images are accessible elements and they have the same attributes as real images.
    33
  • trunk/LayoutTests/css3/flexbox/flexitem.html

    r130979 r168350  
    5353
    5454<div class="flexbox">
    55   <svg data-expected-display="block" data-expected-width="100" style="-webkit-flex: 1 0 auto; width: 100px; height: 100px">
     55  <svg data-expected-display="block" data-expected-width="100" style="-webkit-flex: 1 0 auto; width: 100px; height: 100px;">
    5656    <circle cx="50" cy="50" r="50" fill="blue">
    5757    </circle>
    5858  </svg>
    59   <svg data-expected-display="block" data-expected-width="500" style="-webkit-flex: 1 1 auto; height: 100px">
     59  <svg data-expected-display="block" data-expected-width="500" style="-webkit-flex: 1 1 auto; height: 100px; width: 100%">
    6060    <circle cx="50" cy="50" r="50" fill="green">
    6161    </circle>
  • trunk/LayoutTests/fast/css/infinite-floating-value-expected.txt

    r166114 r168350  
    33fontsize aaa
    44fontsize bbb
    5 line-height
     5 line-height
  • trunk/LayoutTests/fast/css/remove-fixed-resizer-crash-expected.txt

    r127497 r168350  
    11This test should not crash
    22
    3 
     3 
  • trunk/LayoutTests/fast/css3-text/css3-word-spacing-percentage/word-spacing-crash-expected.txt

    r162588 r168350  
    1 This test makes sure that if "inherit" is specified on the word-spacing element when there is no parent element, there is no crash
     1 This test makes sure that if "inherit" is specified on the word-spacing element when there is no parent element, there is no crash
  • trunk/LayoutTests/fast/repaint/moving-shadow-on-container.html

    r53157 r168350  
    4949
    5050    var svgContainer = newSvgElement('svg', document.body);
     51    svgContainer.setAttribute('width','100%');
     52    svgContainer.setAttribute('height','100%');   
    5153    var shapes = [
    5254        { pos: [ 100, 100 ], size: 60, hasStroke: false },
  • trunk/LayoutTests/fast/repaint/moving-shadow-on-path.html

    r53157 r168350  
    4949
    5050    var svgContainer = newSvgElement('svg', document.body);
     51    svgContainer.setAttribute('width','100%');
     52    svgContainer.setAttribute('height','100%');
    5153    var shapes = [
    5254        { pos: [ 100, 100 ], size: 60, hasStroke: false },
  • trunk/LayoutTests/fast/repaint/svg-layout-root-style-attr-update.html

    r61693 r168350  
    1212    // create some SVG
    1313    var svgroot = document.createElementNS("http://www.w3.org/2000/svg", "svg");
     14    svgroot.setAttribute("width", "100%");
     15    svgroot.setAttribute("height", "100%");
    1416    document.getElementById("root").appendChild(svgroot);
    1517    // add a red rectangle that will be covered up by the green rectangle
  • trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-relative-size-svg-expected.html

    r165387 r168350  
    1818</head>
    1919<body>
    20 <p>You should see three blue squares: above the green square, to the green square's right, and below the green square.</p>
     20<p>You should see three green squares: above the blue square, to the blue square's right, and below the blue square.</p>
    2121<div id="container">
    2222  X<br>
  • trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-relative-size-svg.html

    r165387 r168350  
    1313    height: 400px;
    1414    float: left;
    15     -webkit-shape-outside: url("data:image/svg+xml;UTF-8,<svg xmlns='http://www.w3.org/2000/svg' width='50%' height='25%'><rect width='100%' height='100%' fill='blue' /></svg>");
    16     background-image: url("data:image/svg+xml;UTF-8,<svg xmlns='http://www.w3.org/2000/svg' width='50%' height='25%'><rect width='100%' height='100%' fill='blue' /></svg>");
     15    -webkit-shape-outside: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'><rect width='50%' height='25%' fill='blue' /></svg>");
     16    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'><rect width='50%' height='25%' fill='blue' /></svg>");
    1717    background-repeat: no-repeat;
    1818}
     
    2020</head>
    2121<body>
    22 <p>You should see three blue squares: above the green square, to the green square's right, and below the green square.</p>
     22<p>You should see three green squares: above the blue square, to the blue square's right, and below the blue square.</p>
    2323<div id="container">
    2424  <div id="shape-outside"></div>
  • trunk/LayoutTests/http/tests/xmlviewer/dumpAsText/svg-expected.txt

    r79861 r168350  
    1 This tests that xml viewer is not used when there is a tag in SVG namespace.
     1This tests that xml viewer is not used when there is a tag in SVG namespace. 
    22SUCCESS
    33
  • trunk/LayoutTests/platform/mac/svg/batik/filters/feTile-expected.txt

    r149210 r168350  
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    55    RenderSVGContainer {g} at (0,25) size 384x354
    6       RenderSVGText {text} at (187,25) size 75x18 contains 1 chunk(s)
     6      RenderSVGText {text} at (187,25) size 76x19 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 75x18
    88          chunk 1 (middle anchor) text run 1 at (187.50,40.00) startOffset 0 endOffset 11 width 75.00: "feTile Test"
     
    2828          [filter="tile_1"] RenderSVGResourceFilter {filter} at (0,0) size 100x50
    2929        RenderSVGRect {rect} at (19,99) size 102x52 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
    30         RenderSVGText {text} at (30,-30) size 39x18 contains 1 chunk(s)
     30        RenderSVGText {text} at (30,-30) size 40x19 contains 1 chunk(s)
    3131          RenderSVGInlineText {#text} at (0,0) size 39x18
    3232            chunk 1 (middle anchor) text run 1 at (30.50,-15.00) startOffset 0 endOffset 6 width 39.00: "tile_1"
    33         RenderSVGText {text} at (-17,-18) size 133x18 contains 1 chunk(s)
     33        RenderSVGText {text} at (-17,-18) size 134x19 contains 1 chunk(s)
    3434          RenderSVGInlineText {#text} at (0,0) size 133x18
    3535            chunk 1 (middle anchor) text run 1 at (-16.50,-3.00) startOffset 0 endOffset 21 width 133.00: "4 tiles, quarter size"
     
    3838          [filter="tile_2"] RenderSVGResourceFilter {filter} at (0,0) size 100x50
    3939        RenderSVGRect {rect} at (19,199) size 102x52 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
    40         RenderSVGText {text} at (-8,-30) size 115x18 contains 1 chunk(s)
     40        RenderSVGText {text} at (-8,-30) size 116x19 contains 1 chunk(s)
    4141          RenderSVGInlineText {#text} at (0,0) size 115x18
    4242            chunk 1 (middle anchor) text run 1 at (-7.50,-15.00) startOffset 0 endOffset 17 width 115.00: "tile_2 (centered)"
    43         RenderSVGText {text} at (-25,-18) size 149x18 contains 1 chunk(s)
     43        RenderSVGText {text} at (-25,-18) size 150x19 contains 1 chunk(s)
    4444          RenderSVGInlineText {#text} at (0,0) size 149x18
    4545            chunk 1 (middle anchor) text run 1 at (-24.50,-3.00) startOffset 0 endOffset 26 width 149.00: "9 tiles, 1 full, 8 partial"
     
    4848          [filter="tile_3"] RenderSVGResourceFilter {filter} at (-12.50,-6.25) size 100x50
    4949        RenderSVGRect {rect} at (19,299) size 102x52 [stroke={[type=SOLID] [color=#000000]}] [x=-12.50] [y=-7.25] [width=100.00] [height=50.00]
    50         RenderSVGText {text} at (-34,-37) size 142x18 contains 1 chunk(s)
     50        RenderSVGText {text} at (-34,-37) size 143x19 contains 1 chunk(s)
    5151          RenderSVGInlineText {#text} at (0,0) size 142x18
    5252            chunk 1 (middle anchor) text run 1 at (-33.50,-22.25) startOffset 0 endOffset 24 width 142.00: "tile_3 (top left offset)"
    53         RenderSVGText {text} at (-37,-25) size 149x18 contains 1 chunk(s)
     53        RenderSVGText {text} at (-37,-25) size 149x19 contains 1 chunk(s)
    5454          RenderSVGInlineText {#text} at (0,0) size 149x18
    5555            chunk 1 (middle anchor) text run 1 at (-37.00,-10.25) startOffset 0 endOffset 26 width 149.00: "9 tiles, 1 full, 8 partial"
     
    5959        RenderSVGRect {rect} at (244,99) size 131x52 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
    6060      RenderSVGContainer {g} at (260,70) size 70x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(245.00,100.00)}]
    61         RenderSVGText {text} at (30,-30) size 39x18 contains 1 chunk(s)
     61        RenderSVGText {text} at (30,-30) size 40x19 contains 1 chunk(s)
    6262          RenderSVGInlineText {#text} at (0,0) size 39x18
    6363            chunk 1 (middle anchor) text run 1 at (30.50,-15.00) startOffset 0 endOffset 6 width 39.00: "tile_1"
    64         RenderSVGText {text} at (15,-18) size 70x18 contains 1 chunk(s)
     64        RenderSVGText {text} at (15,-18) size 70x19 contains 1 chunk(s)
    6565          RenderSVGInlineText {#text} at (0,0) size 70x18
    6666            chunk 1 (middle anchor) text run 1 at (15.00,-3.00) startOffset 0 endOffset 8 width 70.00: "skewed X"
     
    7070        RenderSVGRect {rect} at (255,201) size 80x58 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
    7171      RenderSVGContainer {g} at (206,170) size 178x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(245.00,200.00)}]
    72         RenderSVGText {text} at (30,-30) size 39x18 contains 1 chunk(s)
     72        RenderSVGText {text} at (30,-30) size 40x19 contains 1 chunk(s)
    7373          RenderSVGInlineText {#text} at (0,0) size 39x18
    7474            chunk 1 (middle anchor) text run 1 at (30.50,-15.00) startOffset 0 endOffset 6 width 39.00: "tile_2"
    75         RenderSVGText {text} at (-39,-18) size 177x18 contains 1 chunk(s)
     75        RenderSVGText {text} at (-39,-18) size 178x19 contains 1 chunk(s)
    7676          RenderSVGInlineText {#text} at (0,0) size 177x18
    7777            chunk 1 (middle anchor) text run 1 at (-38.50,-3.00) startOffset 0 endOffset 26 width 177.00: "(centered, rotate & scale)"
     
    8080          [filter="tile_3"] RenderSVGResourceFilter {filter} at (-12.50,-6.25) size 100x50
    8181        RenderSVGRect {rect} at (244,300) size 102x79 [stroke={[type=SOLID] [color=#000000]}] [x=-12.50] [y=-6.25] [width=100.00] [height=50.00]
    82       RenderSVGContainer {g} at (223,270) size 144x32 [transform={m=((1.00,0.00)(0.00,1.00)) t=(257.50,307.25)}]
    83         RenderSVGText {text} at (-34,-37) size 142x18 contains 1 chunk(s)
     82      RenderSVGContainer {g} at (224,270) size 142x31 [transform={m=((1.00,0.00)(0.00,1.00)) t=(257.50,307.25)}]
     83        RenderSVGText {text} at (-34,-37) size 143x19 contains 1 chunk(s)
    8484          RenderSVGInlineText {#text} at (0,0) size 142x18
    8585            chunk 1 (middle anchor) text run 1 at (-33.50,-22.25) startOffset 0 endOffset 24 width 142.00: "tile_3 (top left offset)"
    86         RenderSVGText {text} at (2,-25) size 70x18 contains 1 chunk(s)
     86        RenderSVGText {text} at (2,-25) size 71x19 contains 1 chunk(s)
    8787          RenderSVGInlineText {#text} at (0,0) size 70x18
    8888            chunk 1 (middle anchor) text run 1 at (2.50,-10.25) startOffset 0 endOffset 8 width 70.00: "skewed Y"
  • trunk/LayoutTests/platform/mac/svg/batik/masking/maskRegions-expected.txt

    r149210 r168350  
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    55    RenderSVGContainer {g} at (90,35) size 265x369
    6       RenderSVGText {text} at (174,35) size 102x18 contains 1 chunk(s)
     6      RenderSVGText {text} at (174,35) size 102x19 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 102x18
    88          chunk 1 (middle anchor) text run 1 at (174.00,50.00) startOffset 0 endOffset 12 width 102.00: "Mask Regions"
     
    3535        RenderSVGContainer {use} at (175,100) size 100x80
    3636          RenderSVGRect {rect} at (175,100) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
    37         RenderSVGText {text} at (22,-18) size 56x18 contains 1 chunk(s)
     37        RenderSVGText {text} at (22,-18) size 56x19 contains 1 chunk(s)
    3838          RenderSVGInlineText {#text} at (0,0) size 56x18
    3939            chunk 1 (middle anchor) text run 1 at (22.00,-3.00) startOffset 0 endOffset 6 width 56.00: "Masked"
     
    4242          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,0) size 90x80
    4343          RenderSVGRect {rect} at (85,220) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
    44         RenderSVGText {text} at (24,-18) size 51x18 contains 1 chunk(s)
     44        RenderSVGText {text} at (24,-18) size 52x19 contains 1 chunk(s)
    4545          RenderSVGInlineText {#text} at (0,0) size 51x18
    4646            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 1"
     
    4949          [masker="mask_2"] RenderSVGResourceMasker {mask} at (25,20) size 50x40
    5050          RenderSVGRect {rect} at (85,340) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
    51         RenderSVGText {text} at (24,-18) size 51x18 contains 1 chunk(s)
     51        RenderSVGText {text} at (24,-18) size 52x19 contains 1 chunk(s)
    5252          RenderSVGInlineText {#text} at (0,0) size 51x18
    5353            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 2"
     
    5656          [masker="mask_3"] RenderSVGResourceMasker {mask} at (25,20) size 50x40
    5757          RenderSVGRect {rect} at (260,220) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
    58         RenderSVGText {text} at (24,-18) size 51x18 contains 1 chunk(s)
     58        RenderSVGText {text} at (24,-18) size 52x19 contains 1 chunk(s)
    5959          RenderSVGInlineText {#text} at (0,0) size 51x18
    6060            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 3"
     
    6363          [masker="mask_4"] RenderSVGResourceMasker {mask} at (5.00,0) size 90.00x64.00
    6464          RenderSVGRect {rect} at (260,340) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
    65         RenderSVGText {text} at (24,-18) size 51x18 contains 1 chunk(s)
     65        RenderSVGText {text} at (24,-18) size 52x19 contains 1 chunk(s)
    6666          RenderSVGInlineText {#text} at (0,0) size 51x18
    6767            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 4"
  • trunk/LayoutTests/platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.txt

    r149210 r168350  
    33layer at (0,0) size 450x500
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    5     RenderSVGText {text} at (105,35) size 240x18 contains 1 chunk(s)
     5    RenderSVGText {text} at (105,35) size 240x19 contains 1 chunk(s)
    66      RenderSVGInlineText {#text} at (0,0) size 240x18
    77        chunk 1 (middle anchor) text run 1 at (105.00,50.00) startOffset 0 endOffset 34 width 240.00: "patternUnits / patternContentUnits"
    8     RenderSVGText {text} at (168,60) size 114x18 contains 1 chunk(s)
     8    RenderSVGText {text} at (168,60) size 114x19 contains 1 chunk(s)
    99      RenderSVGInlineText {#text} at (0,0) size 114x18
    1010        chunk 1 (middle anchor) text run 1 at (168.00,75.00) startOffset 0 endOffset 15 width 114.00: "pattern viewBox"
     
    4242          RenderSVGRect {rect} at (14,119) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern1"]}] [x=20.00] [y=20.00] [width=40.00] [height=30.00]
    4343          RenderSVGContainer {g} at (15,108) size 134x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,20.00)}]
    44             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     44            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    4545              RenderSVGInlineText {#text} at (0,0) size 37x12
    4646                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern1"
    4747            RenderSVGContainer {g} at (65,119) size 84x33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    48               RenderSVGText {text} at (0,-10) size 82x12 contains 1 chunk(s)
     48              RenderSVGText {text} at (0,-10) size 82x13 contains 1 chunk(s)
    4949                RenderSVGInlineText {#text} at (0,0) size 82x12
    5050                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 20 width 82.00: "patternUnits=default"
    51               RenderSVGText {text} at (0,0) size 84x12 contains 1 chunk(s)
     51              RenderSVGText {text} at (0,0) size 84x13 contains 1 chunk(s)
    5252                RenderSVGInlineText {#text} at (0,0) size 84x12
    5353                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 20 width 84.00: "contentUnits=default"
    54               RenderSVGText {text} at (0,10) size 47x12 contains 1 chunk(s)
     54              RenderSVGText {text} at (0,10) size 47x13 contains 1 chunk(s)
    5555                RenderSVGInlineText {#text} at (0,0) size 47x12
    5656                  chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 10 width 47.00: "no viewbox"
     
    5858          RenderSVGRect {rect} at (14,169) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern2"]}] [x=20.00] [y=70.00] [width=40.00] [height=30.00]
    5959          RenderSVGContainer {g} at (15,158) size 186x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,70.00)}]
    60             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     60            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    6161              RenderSVGInlineText {#text} at (0,0) size 37x12
    6262                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern2"
    6363            RenderSVGContainer {g} at (65,169) size 136x23 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    64               RenderSVGText {text} at (0,-10) size 136x12 contains 1 chunk(s)
     64              RenderSVGText {text} at (0,-10) size 136x13 contains 1 chunk(s)
    6565                RenderSVGInlineText {#text} at (0,0) size 136x12
    6666                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 30 width 136.00: "patternUnits=objectBoundingBox"
    67               RenderSVGText {text} at (0,0) size 84x12 contains 1 chunk(s)
     67              RenderSVGText {text} at (0,0) size 84x13 contains 1 chunk(s)
    6868                RenderSVGInlineText {#text} at (0,0) size 84x12
    6969                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 20 width 84.00: "contentUnits=default"
     
    7171          RenderSVGRect {rect} at (14,219) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern3"]}] [x=20.00] [y=120.00] [width=40.00] [height=30.00]
    7272          RenderSVGContainer {g} at (15,208) size 171x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,120.00)}]
    73             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     73            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    7474              RenderSVGInlineText {#text} at (0,0) size 37x12
    7575                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern3"
    7676            RenderSVGContainer {g} at (65,219) size 121x33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    77               RenderSVGText {text} at (0,-10) size 121x12 contains 1 chunk(s)
     77              RenderSVGText {text} at (0,-10) size 121x13 contains 1 chunk(s)
    7878                RenderSVGInlineText {#text} at (0,0) size 121x12
    7979                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 27 width 121.00: "patternUnits=userSpaceOnUse"
    80               RenderSVGText {text} at (0,0) size 84x12 contains 1 chunk(s)
     80              RenderSVGText {text} at (0,0) size 84x13 contains 1 chunk(s)
    8181                RenderSVGInlineText {#text} at (0,0) size 84x12
    8282                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 20 width 84.00: "contentUnits=default"
    83               RenderSVGText {text} at (0,10) size 68x12 contains 1 chunk(s)
     83              RenderSVGText {text} at (0,10) size 68x13 contains 1 chunk(s)
    8484                RenderSVGInlineText {#text} at (0,0) size 68x12
    8585                  chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 16 width 68.00: "overflow=visible"
     
    8787          RenderSVGRect {rect} at (14,269) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern4"]}] [x=20.00] [y=170.00] [width=40.00] [height=30.00]
    8888          RenderSVGContainer {g} at (15,258) size 188x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,170.00)}]
    89             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     89            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    9090              RenderSVGInlineText {#text} at (0,0) size 37x12
    9191                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern4"
    9292            RenderSVGContainer {g} at (65,269) size 138x33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    93               RenderSVGText {text} at (0,-10) size 82x12 contains 1 chunk(s)
     93              RenderSVGText {text} at (0,-10) size 82x13 contains 1 chunk(s)
    9494                RenderSVGInlineText {#text} at (0,0) size 82x12
    9595                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 20 width 82.00: "patternUnits=default"
    96               RenderSVGText {text} at (0,0) size 138x12 contains 1 chunk(s)
     96              RenderSVGText {text} at (0,0) size 138x13 contains 1 chunk(s)
    9797                RenderSVGInlineText {#text} at (0,0) size 138x12
    9898                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 30 width 138.00: "contentUnits=objectBoundingBox"
    99               RenderSVGText {text} at (0,10) size 68x12 contains 1 chunk(s)
     99              RenderSVGText {text} at (0,10) size 68x13 contains 1 chunk(s)
    100100                RenderSVGInlineText {#text} at (0,0) size 68x12
    101101                  chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 16 width 68.00: "overflow=visible"
     
    103103          RenderSVGRect {rect} at (14,319) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern5"]}] [x=20.00] [y=220.00] [width=40.00] [height=30.00]
    104104          RenderSVGContainer {g} at (15,308) size 188x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,220.00)}]
    105             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     105            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    106106              RenderSVGInlineText {#text} at (0,0) size 37x12
    107107                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern5"
    108108            RenderSVGContainer {g} at (65,319) size 138x23 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    109               RenderSVGText {text} at (0,-10) size 136x12 contains 1 chunk(s)
     109              RenderSVGText {text} at (0,-10) size 136x13 contains 1 chunk(s)
    110110                RenderSVGInlineText {#text} at (0,0) size 136x12
    111111                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 30 width 136.00: "patternUnits=objectBoundingBox"
    112               RenderSVGText {text} at (0,0) size 138x12 contains 1 chunk(s)
     112              RenderSVGText {text} at (0,0) size 138x13 contains 1 chunk(s)
    113113                RenderSVGInlineText {#text} at (0,0) size 138x12
    114114                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 30 width 138.00: "contentUnits=objectBoundingBox"
     
    116116          RenderSVGRect {rect} at (14,369) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern6"]}] [x=20.00] [y=270.00] [width=40.00] [height=30.00]
    117117          RenderSVGContainer {g} at (15,358) size 188x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,270.00)}]
    118             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     118            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    119119              RenderSVGInlineText {#text} at (0,0) size 37x12
    120120                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern6"
    121121            RenderSVGContainer {g} at (65,369) size 138x23 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    122               RenderSVGText {text} at (0,-10) size 121x12 contains 1 chunk(s)
     122              RenderSVGText {text} at (0,-10) size 121x13 contains 1 chunk(s)
    123123                RenderSVGInlineText {#text} at (0,0) size 121x12
    124124                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 27 width 121.00: "patternUnits=userSpaceOnUse"
    125               RenderSVGText {text} at (0,0) size 138x12 contains 1 chunk(s)
     125              RenderSVGText {text} at (0,0) size 138x13 contains 1 chunk(s)
    126126                RenderSVGInlineText {#text} at (0,0) size 138x12
    127127                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 30 width 138.00: "contentUnits=objectBoundingBox"
     
    129129          RenderSVGRect {rect} at (219,119) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern7"]}] [x=225.00] [y=20.00] [width=40.00] [height=30.00]
    130130          RenderSVGContainer {g} at (220,108) size 195x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,20.00)}]
    131             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     131            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    132132              RenderSVGInlineText {#text} at (0,0) size 37x12
    133133                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern7"
    134134            RenderSVGContainer {g} at (270,119) size 145x33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    135               RenderSVGText {text} at (0,-10) size 121x12 contains 1 chunk(s)
     135              RenderSVGText {text} at (0,-10) size 121x13 contains 1 chunk(s)
    136136                RenderSVGInlineText {#text} at (0,0) size 121x12
    137137                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 27 width 121.00: "patternUnits=userSpaceOnUse"
    138               RenderSVGText {text} at (0,0) size 138x12 contains 1 chunk(s)
     138              RenderSVGText {text} at (0,0) size 138x13 contains 1 chunk(s)
    139139                RenderSVGInlineText {#text} at (0,0) size 138x12
    140140                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 30 width 138.00: "contentUnits=objectBoundingBox"
    141               RenderSVGText {text} at (0,10) size 145x12 contains 1 chunk(s)
     141              RenderSVGText {text} at (0,10) size 145x13 contains 1 chunk(s)
    142142                RenderSVGInlineText {#text} at (0,0) size 145x12
    143143                  chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 32 width 145.00: "viewBox preserveAspectRatio=none"
     
    145145          RenderSVGRect {rect} at (219,169) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern8"]}] [x=225.00] [y=70.00] [width=40.00] [height=30.00]
    146146          RenderSVGContainer {g} at (220,158) size 204x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,70.00)}]
    147             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     147            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    148148              RenderSVGInlineText {#text} at (0,0) size 37x12
    149149                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern8"
    150150            RenderSVGContainer {g} at (270,169) size 154x23 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    151               RenderSVGText {text} at (0,-10) size 92x12 contains 1 chunk(s)
     151              RenderSVGText {text} at (0,-10) size 92x13 contains 1 chunk(s)
    152152                RenderSVGInlineText {#text} at (0,0) size 92x12
    153153                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 22 width 92.00: "same as pattern#7 with"
    154               RenderSVGText {text} at (0,0) size 154x12 contains 1 chunk(s)
     154              RenderSVGText {text} at (0,0) size 154x13 contains 1 chunk(s)
    155155                RenderSVGInlineText {#text} at (0,0) size 154x12
    156156                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 33 width 154.00: "preserveAspectRatio=xMinYmin meet"
     
    158158          RenderSVGRect {rect} at (219,219) size 42x32 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pattern9"]}] [x=225.00] [y=120.00] [width=40.00] [height=30.00]
    159159          RenderSVGContainer {g} at (220,208) size 203x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,120.00)}]
    160             RenderSVGText {text} at (0,-12) size 37x12 contains 1 chunk(s)
     160            RenderSVGText {text} at (0,-12) size 37x13 contains 1 chunk(s)
    161161              RenderSVGInlineText {#text} at (0,0) size 37x12
    162162                chunk 1 text run 1 at (0.00,-2.00) startOffset 0 endOffset 9 width 37.00: "#pattern9"
    163163            RenderSVGContainer {g} at (270,219) size 153x23 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,9.00)}]
    164               RenderSVGText {text} at (0,-10) size 153x12 contains 1 chunk(s)
     164              RenderSVGText {text} at (0,-10) size 153x13 contains 1 chunk(s)
    165165                RenderSVGInlineText {#text} at (0,0) size 153x12
    166166                  chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 34 width 153.00: "preserveAspectRatio=xMinYmin slice"
    167               RenderSVGText {text} at (0,0) size 68x12 contains 1 chunk(s)
     167              RenderSVGText {text} at (0,0) size 68x13 contains 1 chunk(s)
    168168                RenderSVGInlineText {#text} at (0,0) size 68x12
    169169                  chunk 1 text run 1 at (0.00,10.00) startOffset 0 endOffset 16 width 68.00: "overflow=visible"
  • trunk/LayoutTests/platform/mac/svg/batik/text/longTextOnPath-expected.txt

    r110676 r168350  
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    55    RenderSVGContainer {g} at (20,25) size 407x450
    6       RenderSVGText {text} at (98,25) size 254x18 contains 1 chunk(s)
     6      RenderSVGText {text} at (98,25) size 254x19 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 254x18
    88          chunk 1 (middle anchor) text run 1 at (98.00,40.00) startOffset 0 endOffset 38 width 254.00: "Long text on a path test for selection"
  • trunk/LayoutTests/platform/mac/svg/batik/text/textDecoration-expected.txt

    r149210 r168350  
    1212          RenderSVGRect {rect} at (5,0) size 5x5 [fill={[type=SOLID] [color=#000000]}] [x=5.00] [y=0.00] [width=5.00] [height=5.00]
    1313    RenderSVGContainer {g} at (49,25) size 329x440
    14       RenderSVGText {text} at (155,25) size 139x18 contains 1 chunk(s)
     14      RenderSVGText {text} at (155,25) size 140x19 contains 1 chunk(s)
    1515        RenderSVGInlineText {#text} at (0,0) size 139x18
    1616          chunk 1 (middle anchor) text run 1 at (155.50,40.00) startOffset 0 endOffset 20 width 139.00: "Text decoration test"
  • trunk/LayoutTests/platform/mac/svg/batik/text/textEffect-expected.txt

    r149210 r168350  
    33layer at (0,0) size 450x500
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    5     RenderSVGContainer {g} at (28,15) size 395x388
    6       RenderSVGText {text} at (136,15) size 177x18 contains 1 chunk(s)
     5    RenderSVGContainer {g} at (28,15) size 394x388
     6      RenderSVGText {text} at (136,15) size 178x19 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 177x18
    88          chunk 1 (middle anchor) text run 1 at (136.50,30.00) startOffset 0 endOffset 27 width 177.00: "Gradient and filter on text"
    9       RenderSVGText {text} at (106,35) size 238x18 contains 1 chunk(s)
     9      RenderSVGText {text} at (106,35) size 238x19 contains 1 chunk(s)
    1010        RenderSVGInlineText {#text} at (0,0) size 238x18
    1111          chunk 1 (middle anchor) text run 1 at (106.00,50.00) startOffset 0 endOffset 32 width 238.00: "(Using System font and SVG font)"
     
    3535          chunk 1 (middle anchor) text run 1 at (253.42,260.00) startOffset 0 endOffset 5 width 153.15: "BATIK"
    3636      RenderSVGText {text} at (44,312) size 152x60 contains 1 chunk(s)
    37         [filter="dropShadow"] RenderSVGResourceFilter {filter} at (28.80,306) size 182.40x72
     37        [filter="dropShadow"] RenderSVGResourceFilter {filter} at (28.80,306.09) size 182.40x71.06
    3838        RenderSVGInlineText {#text} at (0,0) size 152x60
    3939          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (28.80,306.10) size 182.40x71.05
    4040          chunk 1 (middle anchor) text run 1 at (44.00,360.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
    4141      RenderSVGText {text} at (253,312) size 154x60 contains 1 chunk(s)
    42         [filter="dropShadow"] RenderSVGResourceFilter {filter} at (237.60,306) size 184.80x72
     42        [filter="dropShadow"] RenderSVGResourceFilter {filter} at (238.11,306.09) size 183.79x71.06
    4343        RenderSVGInlineText {#text} at (0,0) size 154x60
    4444          [filter="dropShadow"] RenderSVGResourceFilter {filter} at (238.11,306.10) size 183.78x71.05
    4545          chunk 1 (middle anchor) text run 1 at (253.42,360.00) startOffset 0 endOffset 5 width 153.15: "BATIK"
    46       RenderSVGText {text} at (87,389) size 65x14 contains 1 chunk(s)
     46      RenderSVGText {text} at (87,389) size 66x14 contains 1 chunk(s)
    4747        RenderSVGInlineText {#text} at (0,0) size 65x14
    4848          chunk 1 (middle anchor) text run 1 at (87.50,400.00) startOffset 0 endOffset 13 width 65.00: "(System font)"
    49       RenderSVGText {text} at (302,389) size 55x14 contains 1 chunk(s)
     49      RenderSVGText {text} at (302,389) size 56x14 contains 1 chunk(s)
    5050        RenderSVGInlineText {#text} at (0,0) size 55x14
    5151          chunk 1 (middle anchor) text run 1 at (302.50,400.00) startOffset 0 endOffset 10 width 55.00: "(SVG font)"
  • trunk/LayoutTests/platform/mac/svg/batik/text/textLength-expected.txt

    r149210 r168350  
    33layer at (0,0) size 450x500
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    5     RenderSVGText {text} at (144,5) size 162x18 contains 1 chunk(s)
     5    RenderSVGText {text} at (144,5) size 162x19 contains 1 chunk(s)
    66      RenderSVGInlineText {#text} at (0,0) size 162x18
    77        chunk 1 (middle anchor) text run 1 at (144.00,20.00) startOffset 0 endOffset 22 width 162.00: "textLength with Anchor"
     
    3131                RenderSVGRect {rect} at (200,35) size 50x20 [fill={[type=SOLID] [color=#DDE8FF]}] [x=200.00] [y=5.00] [width=50.00] [height=20.00]
    3232                RenderSVGPath {line} at (224,33) size 2x24 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=225.00] [y1=3.00] [x2=225.00] [y2=27.00]
    33         RenderSVGText {text} at (202,8) size 45x14 contains 1 chunk(s)
     33        RenderSVGText {text} at (202,8) size 46x14 contains 1 chunk(s)
    3434          RenderSVGInlineText {#text} at (0,0) size 45x14
    3535            chunk 1 (middle anchor) text run 1 at (202.50,19.00) startOffset 0 endOffset 9 width 45.00: "xml-batik"
     
    8787                RenderSVGRect {rect} at (200,215) size 50x20 [fill={[type=SOLID] [color=#DDE8FF]}] [x=200.00] [y=5.00] [width=50.00] [height=20.00]
    8888                RenderSVGPath {line} at (224,213) size 2x24 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=225.00] [y1=3.00] [x2=225.00] [y2=27.00]
    89         RenderSVGText {text} at (202,8) size 45x14 contains 1 chunk(s)
     89        RenderSVGText {text} at (202,8) size 46x14 contains 1 chunk(s)
    9090          RenderSVGInlineText {#text} at (0,0) size 45x14
    9191            chunk 1 (middle anchor) text run 1 at (202.50,19.00) startOffset 0 endOffset 1 width 8.00: "B"
     
    148148        RenderSVGRect {rect} at (112,395) size 26x80 [fill={[type=SOLID] [color=#DDE8FF]}] [x=112.50] [y=5.00] [width=25.00] [height=80.00]
    149149        RenderSVGPath {line} at (124,393) size 2x84 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=125.00] [y1=3.00] [x2=125.00] [y2=87.00]
    150         RenderSVGText {text} at (112,-11) size 25x115 contains 1 chunk(s)
     150        RenderSVGText {text} at (112,-11) size 26x115 contains 1 chunk(s)
    151151          RenderSVGInlineText {#text} at (0,0) size 25x115
    152152            chunk 1 (middle anchor) text run 1 at (-33.50,79.00) startOffset 0 endOffset 9 width 317.00: "B a t i k"
  • trunk/LayoutTests/platform/mac/svg/batik/text/textOnPath-expected.txt

    r110676 r168350  
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    55    RenderSVGContainer {g} at (9,25) size 430x418
    6       RenderSVGText {text} at (160,25) size 130x18 contains 1 chunk(s)
     6      RenderSVGText {text} at (160,25) size 130x19 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 130x18
    88          chunk 1 (middle anchor) text run 1 at (160.00,40.00) startOffset 0 endOffset 19 width 130.00: "Text on a path test"
     
    1111        RenderSVGPath {path} at (29,0) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M 100 100 C 100 0 400 0 400 100"]
    1212      RenderSVGContainer {g} at (11,54) size 123x89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
    13         RenderSVGContainer {use} at (29,70) size 92x50
    14           RenderSVGPath {path} at (29,70) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    15         RenderSVGText {text} at (11,-16) size 122x67 contains 1 chunk(s)
     13        RenderSVGContainer {use} at (29,69) size 92x51
     14          RenderSVGPath {path} at (29,69) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     15        RenderSVGText {text} at (11,-16) size 123x67 contains 1 chunk(s)
    1616          RenderSVGTextPath {textPath} at (0,0) size 122x67
    1717            RenderSVGInlineText {#text} at (0,16) size 43x50
     
    3535                chunk 1 text run 7 at (115.10,31.78) startOffset 6 endOffset 7 width 10.00: "h"
    3636          RenderSVGInlineText {#text} at (0,0) size 0x0
    37         RenderSVGText {text} at (35,50) size 68x12 contains 1 chunk(s)
     37        RenderSVGText {text} at (35,50) size 68x13 contains 1 chunk(s)
    3838          RenderSVGInlineText {#text} at (0,0) size 68x12
    3939            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 68.00: "startOffset=\"0%\""
    40         RenderSVGText {text} at (35,60) size 75x12 contains 1 chunk(s)
     40        RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
    4141          RenderSVGInlineText {#text} at (0,0) size 75x12
    4242            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
    4343      RenderSVGContainer {g} at (162,65) size 109x78 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}]
    44         RenderSVGContainer {use} at (179,70) size 92x50
    45           RenderSVGPath {path} at (179,70) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     44        RenderSVGContainer {use} at (179,69) size 92x51
     45          RenderSVGPath {path} at (179,69) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    4646        RenderSVGText {text} at (12,-5) size 57x53 contains 1 chunk(s)
    4747          RenderSVGTextPath {textPath} at (0,0) size 57x53
     
    5959                chunk 1 (middle anchor) text run 7 at (63.03,13.71) startOffset 6 endOffset 7 width 10.00: "h"
    6060          RenderSVGInlineText {#text} at (0,0) size 0x0
    61         RenderSVGText {text} at (35,50) size 68x12 contains 1 chunk(s)
     61        RenderSVGText {text} at (35,50) size 68x13 contains 1 chunk(s)
    6262          RenderSVGInlineText {#text} at (0,0) size 68x12
    6363            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 68.00: "startOffset=\"0%\""
    64         RenderSVGText {text} at (35,60) size 86x12 contains 1 chunk(s)
     64        RenderSVGText {text} at (35,60) size 86x13 contains 1 chunk(s)
    6565          RenderSVGInlineText {#text} at (0,0) size 86x12
    6666            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
    6767      RenderSVGContainer {g} at (301,64) size 120x79 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}]
    68         RenderSVGContainer {use} at (329,70) size 92x50
    69           RenderSVGPath {path} at (329,70) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    70         RenderSVGText {text} at (1,-6) size 74x55 contains 1 chunk(s)
     68        RenderSVGContainer {use} at (329,69) size 92x51
     69          RenderSVGPath {path} at (329,69) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     70        RenderSVGText {text} at (1,-6) size 75x55 contains 1 chunk(s)
    7171          RenderSVGTextPath {textPath} at (0,0) size 74x55
    7272            RenderSVGInlineText {#text} at (-1,5) size 0x0
     
    8484                chunk 1 (end anchor) text run 7 at (70.01,12.71) startOffset 6 endOffset 7 width 10.00: "h"
    8585          RenderSVGInlineText {#text} at (0,0) size 0x0
    86         RenderSVGText {text} at (35,50) size 73x12 contains 1 chunk(s)
     86        RenderSVGText {text} at (35,50) size 73x13 contains 1 chunk(s)
    8787          RenderSVGInlineText {#text} at (0,0) size 73x12
    8888            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 73.00: "startOffset=\"50%\""
    89         RenderSVGText {text} at (35,60) size 72x12 contains 1 chunk(s)
     89        RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
    9090          RenderSVGInlineText {#text} at (0,0) size 72x12
    9191            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
    9292      RenderSVGContainer {g} at (29,164) size 119x79 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}]
    93         RenderSVGContainer {use} at (29,170) size 92x50
    94           RenderSVGPath {path} at (29,170) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    95         RenderSVGText {text} at (74,-6) size 73x58 contains 1 chunk(s)
     93        RenderSVGContainer {use} at (29,169) size 92x51
     94          RenderSVGPath {path} at (29,169) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     95        RenderSVGText {text} at (74,-6) size 74x58 contains 1 chunk(s)
    9696          RenderSVGTextPath {textPath} at (0,0) size 73x58
    9797            RenderSVGInlineText {#text} at (0,0) size 52x38
     
    109109                chunk 1 text run 1 at (119.99,48.94) startOffset 0 endOffset 1 width 5.00: " "
    110110          RenderSVGInlineText {#text} at (0,0) size 0x0
    111         RenderSVGText {text} at (35,50) size 73x12 contains 1 chunk(s)
     111        RenderSVGText {text} at (35,50) size 73x13 contains 1 chunk(s)
    112112          RenderSVGInlineText {#text} at (0,0) size 73x12
    113113            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 73.00: "startOffset=\"50%\""
    114         RenderSVGText {text} at (35,60) size 75x12 contains 1 chunk(s)
     114        RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
    115115          RenderSVGInlineText {#text} at (0,0) size 75x12
    116116            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
    117117      RenderSVGContainer {g} at (163,154) size 124x89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}]
    118         RenderSVGContainer {use} at (179,170) size 92x50
    119           RenderSVGPath {path} at (179,170) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     118        RenderSVGContainer {use} at (179,169) size 92x51
     119          RenderSVGPath {path} at (179,169) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    120120        RenderSVGText {text} at (13,-16) size 124x61 contains 1 chunk(s)
    121121          RenderSVGTextPath {textPath} at (0,0) size 124x61
     
    140140                chunk 1 (middle anchor) text run 7 at (118.10,38.15) startOffset 6 endOffset 7 width 10.00: "h"
    141141          RenderSVGInlineText {#text} at (0,0) size 0x0
    142         RenderSVGText {text} at (35,50) size 73x12 contains 1 chunk(s)
     142        RenderSVGText {text} at (35,50) size 73x13 contains 1 chunk(s)
    143143          RenderSVGInlineText {#text} at (0,0) size 73x12
    144144            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 73.00: "startOffset=\"50%\""
    145         RenderSVGText {text} at (35,60) size 86x12 contains 1 chunk(s)
     145        RenderSVGText {text} at (35,60) size 86x13 contains 1 chunk(s)
    146146          RenderSVGInlineText {#text} at (0,0) size 86x12
    147147            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
    148148      RenderSVGContainer {g} at (317,154) size 122x89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}]
    149         RenderSVGContainer {use} at (329,170) size 92x50
    150           RenderSVGPath {path} at (329,170) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     149        RenderSVGContainer {use} at (329,169) size 92x51
     150          RenderSVGPath {path} at (329,169) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    151151        RenderSVGText {text} at (17,-16) size 122x67 contains 1 chunk(s)
    152152          RenderSVGTextPath {textPath} at (0,0) size 122x67
     
    171171                chunk 1 (end anchor) text run 7 at (119.69,45.01) startOffset 6 endOffset 7 width 10.00: "h"
    172172          RenderSVGInlineText {#text} at (0,0) size 0x0
    173         RenderSVGText {text} at (35,50) size 78x12 contains 1 chunk(s)
     173        RenderSVGText {text} at (35,50) size 78x13 contains 1 chunk(s)
    174174          RenderSVGInlineText {#text} at (0,0) size 78x12
    175175            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 18 width 78.00: "startOffset=\"100%\""
    176         RenderSVGText {text} at (35,60) size 72x12 contains 1 chunk(s)
     176        RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
    177177          RenderSVGInlineText {#text} at (0,0) size 72x12
    178178            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
    179179      RenderSVGContainer {g} at (29,256) size 109x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
    180         RenderSVGContainer {use} at (29,270) size 92x50
    181           RenderSVGPath {path} at (29,270) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    182         RenderSVGText {text} at (38,-14) size 100x61 contains 1 chunk(s)
     180        RenderSVGContainer {use} at (29,269) size 92x51
     181          RenderSVGPath {path} at (29,269) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     182        RenderSVGText {text} at (38,-14) size 100x62 contains 1 chunk(s)
    183183          RenderSVGTextPath {textPath} at (0,0) size 100x61
    184184            RenderSVGInlineText {#text} at (0,7) size 51x31
     
    199199                chunk 1 text run 4 at (118.81,40.49) startOffset 3 endOffset 4 width 11.00: "P"
    200200          RenderSVGInlineText {#text} at (0,0) size 0x0
    201         RenderSVGText {text} at (35,50) size 65x12 contains 1 chunk(s)
     201        RenderSVGText {text} at (35,50) size 65x13 contains 1 chunk(s)
    202202          RenderSVGInlineText {#text} at (0,0) size 65x12
    203203            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 65.00: "startOffset=\"35\""
    204         RenderSVGText {text} at (35,60) size 75x12 contains 1 chunk(s)
     204        RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
    205205          RenderSVGInlineText {#text} at (0,0) size 75x12
    206206            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
    207207      RenderSVGContainer {g} at (161,264) size 110x79 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}]
    208         RenderSVGContainer {use} at (179,270) size 92x50
    209           RenderSVGPath {path} at (179,270) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    210         RenderSVGText {text} at (11,-6) size 98x59 contains 1 chunk(s)
     208        RenderSVGContainer {use} at (179,269) size 92x51
     209          RenderSVGPath {path} at (179,269) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     210        RenderSVGText {text} at (11,-6) size 99x59 contains 1 chunk(s)
    211211          RenderSVGTextPath {textPath} at (0,0) size 98x59
    212212            RenderSVGInlineText {#text} at (0,30) size 28x29
     
    228228                chunk 1 (middle anchor) text run 7 at (97.35,16.96) startOffset 6 endOffset 7 width 10.00: "h"
    229229          RenderSVGInlineText {#text} at (0,0) size 0x0
    230         RenderSVGText {text} at (35,50) size 65x12 contains 1 chunk(s)
     230        RenderSVGText {text} at (35,50) size 65x13 contains 1 chunk(s)
    231231          RenderSVGInlineText {#text} at (0,0) size 65x12
    232232            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 65.00: "startOffset=\"35\""
    233         RenderSVGText {text} at (35,60) size 86x12 contains 1 chunk(s)
     233        RenderSVGText {text} at (35,60) size 86x13 contains 1 chunk(s)
    234234          RenderSVGInlineText {#text} at (0,0) size 86x12
    235235            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
    236       RenderSVGContainer {g} at (311,270) size 110x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}]
    237         RenderSVGContainer {use} at (329,270) size 92x50
    238           RenderSVGPath {path} at (329,270) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    239         RenderSVGText {text} at (11,6) size 38x45 contains 1 chunk(s)
     236      RenderSVGContainer {g} at (311,269) size 110x74 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}]
     237        RenderSVGContainer {use} at (329,269) size 92x51
     238          RenderSVGPath {path} at (329,269) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     239        RenderSVGText {text} at (11,6) size 39x46 contains 1 chunk(s)
    240240          RenderSVGTextPath {textPath} at (0,0) size 38x45
    241241            RenderSVGInlineText {#text} at (-11,-6) size 0x0
     
    249249                chunk 1 (end anchor) text run 4 at (41.96,23.55) startOffset 6 endOffset 7 width 10.00: "h"
    250250          RenderSVGInlineText {#text} at (0,0) size 0x0
    251         RenderSVGText {text} at (35,50) size 65x12 contains 1 chunk(s)
     251        RenderSVGText {text} at (35,50) size 65x13 contains 1 chunk(s)
    252252          RenderSVGInlineText {#text} at (0,0) size 65x12
    253253            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 65.00: "startOffset=\"35\""
    254         RenderSVGText {text} at (35,60) size 72x12 contains 1 chunk(s)
     254        RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
    255255          RenderSVGInlineText {#text} at (0,0) size 72x12
    256256            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
     
    258258        RenderSVGContainer {use} at (24,370) size 121x45
    259259          RenderSVGPath {path} at (24,370) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    260         RenderSVGText {text} at (-1,-11) size 123x57 contains 1 chunk(s)
     260        RenderSVGText {text} at (-1,-11) size 123x58 contains 1 chunk(s)
    261261          RenderSVGTextPath {textPath} at (0,0) size 123x57
    262262            RenderSVGTSpan {tspan} at (0,0) size 41x38
     
    287287              chunk 1 text run 7 at (117.51,20.46) startOffset 6 endOffset 7 width 6.00: "s"
    288288          RenderSVGInlineText {#text} at (0,0) size 0x0
    289         RenderSVGText {text} at (20,50) size 88x12 contains 1 chunk(s)
     289        RenderSVGText {text} at (20,50) size 88x13 contains 1 chunk(s)
    290290          RenderSVGInlineText {#text} at (0,0) size 88x12
    291291            chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 22 width 88.00: "baseline-shift=\"super\""
    292         RenderSVGText {text} at (20,60) size 98x12 contains 1 chunk(s)
     292        RenderSVGText {text} at (20,60) size 98x13 contains 1 chunk(s)
    293293          RenderSVGInlineText {#text} at (0,0) size 98x12
    294294            chunk 1 text run 1 at (20.00,70.00) startOffset 0 endOffset 24 width 98.00: "and baseline-shift=\"sub\""
     
    296296        RenderSVGContainer {use} at (169,370) size 121x45
    297297          RenderSVGPath {path} at (169,370) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    298         RenderSVGText {text} at (3,-8) size 125x51 contains 1 chunk(s)
     298        RenderSVGText {text} at (3,-8) size 126x52 contains 1 chunk(s)
    299299          RenderSVGTextPath {textPath} at (0,0) size 125x51
    300300            RenderSVGTSpan {tspan} at (0,0) size 60x39
     
    325325                chunk 1 text run 8 at (122.46,18.06) startOffset 7 endOffset 8 width 7.00: "e"
    326326          RenderSVGInlineText {#text} at (0,0) size 0x0
    327         RenderSVGText {text} at (20,50) size 97x12 contains 1 chunk(s)
     327        RenderSVGText {text} at (20,50) size 97x13 contains 1 chunk(s)
    328328          RenderSVGInlineText {#text} at (0,0) size 97x12
    329329            chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 23 width 97.00: "baseline-shift=\"+/-20%\""
    330330      RenderSVGContainer {g} at (304,366) size 121x67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}]
    331331        RenderSVGContainer {g} at (304,366) size 121x49 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}]
    332           RenderSVGContainer {use} at (314,390) size 47x25
    333             RenderSVGPath {path} at (314,390) size 47x25 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    334           RenderSVGText {text} at (9,-47) size 239x88 contains 1 chunk(s)
     332          RenderSVGContainer {use} at (314,389) size 47x26
     333            RenderSVGPath {path} at (314,389) size 47x26 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     334          RenderSVGText {text} at (9,-47) size 240x88 contains 1 chunk(s)
    335335            RenderSVGInlineText {#text} at (20,0) size 150x34
    336336              chunk 1 text run 1 at (30.00,-20.00) startOffset 0 endOffset 12 width 150.00: "before path "
     
    346346            RenderSVGInlineText {#text} at (112,42) size 126x34
    347347              chunk 1 text run 1 at (122.49,22.29) startOffset 0 endOffset 11 width 126.00: " after path"
    348         RenderSVGText {text} at (15,30) size 98x12 contains 1 chunk(s)
     348        RenderSVGText {text} at (15,30) size 98x13 contains 1 chunk(s)
    349349          RenderSVGInlineText {#text} at (0,0) size 98x12
    350350            chunk 1 text run 1 at (15.00,40.00) startOffset 0 endOffset 26 width 98.00: "text before/after textPath"
  • trunk/LayoutTests/platform/mac/svg/batik/text/textPosition-expected.txt

    r149210 r168350  
    33layer at (0,0) size 450x500
    44  RenderSVGRoot {svg} at (0,0) size 449x498
    5     RenderSVGText {text} at (178,15) size 93x18 contains 1 chunk(s)
     5    RenderSVGText {text} at (178,15) size 94x19 contains 1 chunk(s)
    66      RenderSVGInlineText {#text} at (0,0) size 93x18
    77        chunk 1 (middle anchor) text run 1 at (178.50,30.00) startOffset 0 endOffset 13 width 93.00: "Text Position"
    88    RenderSVGContainer {g} at (50,58) size 399x345
    9       RenderSVGText {text} at (50,58) size 53x27 contains 1 chunk(s)
     9      RenderSVGText {text} at (50,58) size 53x28 contains 1 chunk(s)
    1010        RenderSVGInlineText {#text} at (0,0) size 53x27
    1111          chunk 1 text run 1 at (50.00,80.00) startOffset 0 endOffset 5 width 53.00: "Batik"
    12       RenderSVGText {text} at (50,90) size 103x12 contains 1 chunk(s)
     12      RenderSVGText {text} at (50,90) size 103x13 contains 1 chunk(s)
    1313        RenderSVGInlineText {#text} at (0,0) size 103x12
    1414          chunk 1 text run 1 at (50.00,100.00) startOffset 0 endOffset 21 width 103.00: "<text x=\"100\" y=\"80\">"
    15       RenderSVGText {text} at (240,58) size 133x27 contains 1 chunk(s)
     15      RenderSVGText {text} at (240,58) size 133x28 contains 1 chunk(s)
    1616        RenderSVGInlineText {#text} at (0,0) size 133x27
    1717          chunk 1 text run 1 at (240.00,80.00) startOffset 0 endOffset 1 width 16.00: "B"
     
    2020          chunk 1 text run 4 at (336.00,80.00) startOffset 3 endOffset 4 width 5.00: "i"
    2121          chunk 1 text run 5 at (361.00,80.00) startOffset 4 endOffset 5 width 12.00: "k"
    22       RenderSVGText {text} at (240,90) size 194x12 contains 1 chunk(s)
     22      RenderSVGText {text} at (240,90) size 194x13 contains 1 chunk(s)
    2323        RenderSVGInlineText {#text} at (0,0) size 194x12
    2424          chunk 1 text run 1 at (240.00,100.00) startOffset 0 endOffset 41 width 194.00: "<text x=\"240\" y=\"80\" letter-spacing=\"20\">"
    25       RenderSVGText {text} at (50,118) size 92x27 contains 1 chunk(s)
     25      RenderSVGText {text} at (50,118) size 92x28 contains 1 chunk(s)
    2626        RenderSVGInlineText {#text} at (0,0) size 92x27
    2727          chunk 1 text run 1 at (50.00,140.00) startOffset 0 endOffset 1 width 16.00: "B"
     
    3030          chunk 1 text run 1 at (110.00,140.00) startOffset 0 endOffset 1 width 5.00: "i"
    3131          chunk 1 text run 1 at (130.00,140.00) startOffset 0 endOffset 1 width 12.00: "k"
    32       RenderSVGText {text} at (50,150) size 175x12 contains 1 chunk(s)
     32      RenderSVGText {text} at (50,150) size 175x13 contains 1 chunk(s)
    3333        RenderSVGInlineText {#text} at (0,0) size 175x12
    3434          chunk 1 text run 1 at (50.00,160.00) startOffset 0 endOffset 35 width 175.00: "<text x=\"50 70 90 110 130\" y=\"140\">"
    35       RenderSVGText {text} at (240,118) size 133x27 contains 1 chunk(s)
     35      RenderSVGText {text} at (240,118) size 133x28 contains 1 chunk(s)
    3636        RenderSVGInlineText {#text} at (0,0) size 133x27
    3737          chunk 1 text run 1 at (240.00,140.00) startOffset 0 endOffset 1 width 16.00: "B"
     
    4040          chunk 1 text run 4 at (336.00,140.00) startOffset 3 endOffset 4 width 5.00: "i"
    4141          chunk 1 text run 5 at (361.00,140.00) startOffset 4 endOffset 5 width 12.00: "k"
    42       RenderSVGText {text} at (240,150) size 175x12 contains 1 chunk(s)
     42      RenderSVGText {text} at (240,150) size 175x13 contains 1 chunk(s)
    4343        RenderSVGInlineText {#text} at (0,0) size 175x12
    4444          chunk 1 text run 1 at (240.00,160.00) startOffset 0 endOffset 35 width 175.00: "<text dx=\"240 20 20 20 20\" y=\"140\">"
    45       RenderSVGText {text} at (50,178) size 53x27 contains 1 chunk(s)
     45      RenderSVGText {text} at (50,178) size 53x28 contains 1 chunk(s)
    4646        RenderSVGTSpan {tspan} at (0,0) size 53x27
    4747          RenderSVGInlineText {#text} at (0,0) size 53x27
    4848            chunk 1 text run 1 at (50.00,200.00) startOffset 0 endOffset 5 width 53.00: "Batik"
    49       RenderSVGText {text} at (50,210) size 112x12 contains 1 chunk(s)
     49      RenderSVGText {text} at (50,210) size 112x13 contains 1 chunk(s)
    5050        RenderSVGInlineText {#text} at (0,0) size 112x12
    5151          chunk 1 text run 1 at (50.00,220.00) startOffset 0 endOffset 22 width 112.00: "<tspan x=\"50\" y=\"200\">"
    52       RenderSVGText {text} at (240,178) size 133x27 contains 1 chunk(s)
     52      RenderSVGText {text} at (240,178) size 133x28 contains 1 chunk(s)
    5353        RenderSVGTSpan {tspan} at (0,0) size 133x27
    5454          RenderSVGInlineText {#text} at (0,0) size 133x27
     
    5858            chunk 1 text run 4 at (336.00,200.00) startOffset 3 endOffset 4 width 5.00: "i"
    5959            chunk 1 text run 5 at (361.00,200.00) startOffset 4 endOffset 5 width 12.00: "k"
    60       RenderSVGText {text} at (240,210) size 209x12 contains 1 chunk(s)
     60      RenderSVGText {text} at (240,210) size 209x13 contains 1 chunk(s)
    6161        RenderSVGTSpan {tspan} at (0,0) size 209x12
    6262          RenderSVGInlineText {#text} at (0,0) size 209x12
    6363            chunk 1 text run 1 at (240.00,220.00) startOffset 0 endOffset 43 width 209.00: "<tspan x=\"240\" y=\"200\" letter-spacing=\"20\">"
    64       RenderSVGText {text} at (50,238) size 92x27 contains 1 chunk(s)
     64      RenderSVGText {text} at (50,238) size 92x28 contains 1 chunk(s)
    6565        RenderSVGTSpan {tspan} at (0,0) size 92x27
    6666          RenderSVGInlineText {#text} at (0,0) size 92x27
     
    7070            chunk 1 text run 1 at (110.00,260.00) startOffset 0 endOffset 1 width 5.00: "i"
    7171            chunk 1 text run 1 at (130.00,260.00) startOffset 0 endOffset 1 width 12.00: "k"
    72       RenderSVGText {text} at (50,270) size 184x12 contains 1 chunk(s)
     72      RenderSVGText {text} at (50,270) size 184x13 contains 1 chunk(s)
    7373        RenderSVGInlineText {#text} at (0,0) size 184x12
    7474          chunk 1 text run 1 at (50.00,280.00) startOffset 0 endOffset 36 width 184.00: "<tspan x=\"50 70 90 110 130\" y=\"260\">"
    75       RenderSVGText {text} at (240,238) size 133x27 contains 1 chunk(s)
     75      RenderSVGText {text} at (240,238) size 133x28 contains 1 chunk(s)
    7676        RenderSVGTSpan {tspan} at (0,0) size 133x27
    7777          RenderSVGInlineText {#text} at (0,0) size 133x27
     
    8181            chunk 1 text run 4 at (336.00,260.00) startOffset 3 endOffset 4 width 5.00: "i"
    8282            chunk 1 text run 5 at (361.00,260.00) startOffset 4 endOffset 5 width 12.00: "k"
    83       RenderSVGText {text} at (240,270) size 184x12 contains 1 chunk(s)
     83      RenderSVGText {text} at (240,270) size 184x13 contains 1 chunk(s)
    8484        RenderSVGInlineText {#text} at (0,0) size 184x12
    8585          chunk 1 text run 1 at (240.00,280.00) startOffset 0 endOffset 36 width 184.00: "<tspan dx=\"240 20 20 20 20\" y=\"260\">"
    86       RenderSVGText {text} at (50,298) size 92x27 contains 1 chunk(s)
     86      RenderSVGText {text} at (50,298) size 92x28 contains 1 chunk(s)
    8787        RenderSVGTSpan {tspan} at (0,0) size 92x27
    8888          RenderSVGInlineText {#text} at (0,0) size 92x27
     
    9292            chunk 1 text run 1 at (110.00,320.00) startOffset 0 endOffset 1 width 5.00: "i"
    9393            chunk 1 text run 1 at (130.00,320.00) startOffset 0 endOffset 1 width 12.00: "k"
    94       RenderSVGText {text} at (50,330) size 170x23 contains 1 chunk(s)
     94      RenderSVGText {text} at (50,330) size 170x24 contains 1 chunk(s)
    9595        RenderSVGInlineText {#text} at (0,0) size 129x12
    9696          chunk 1 text run 1 at (50.00,340.00) startOffset 0 endOffset 26 width 129.00: "<tspan x=\"50 60 70 80 90\" "
     
    9898          RenderSVGInlineText {#text} at (33,11) size 137x12
    9999            chunk 1 text run 1 at (83.00,351.00) startOffset 0 endOffset 27 width 137.00: "dx=\"0 10 20 30 40\" y=\"320\">"
    100       RenderSVGText {text} at (240,298) size 133x27 contains 1 chunk(s)
     100      RenderSVGText {text} at (240,298) size 133x28 contains 1 chunk(s)
    101101        RenderSVGTSpan {tspan} at (0,0) size 133x27
    102102          RenderSVGInlineText {#text} at (0,0) size 133x27
     
    106106            chunk 1 text run 4 at (336.00,320.00) startOffset 3 endOffset 4 width 5.00: "i"
    107107            chunk 1 text run 5 at (361.00,320.00) startOffset 4 endOffset 5 width 12.00: "k"
    108       RenderSVGText {text} at (240,330) size 191x23 contains 1 chunk(s)
     108      RenderSVGText {text} at (240,330) size 191x24 contains 1 chunk(s)
    109109        RenderSVGInlineText {#text} at (0,0) size 169x12
    110110          chunk 1 text run 1 at (240.00,340.00) startOffset 0 endOffset 34 width 169.00: "<tspan x=\"240\" dx=\"0 10 10 10 10\" "
     
    112112          RenderSVGInlineText {#text} at (33,11) size 158x12
    113113            chunk 1 text run 1 at (273.00,351.00) startOffset 0 endOffset 34 width 158.00: "y=\"320\" style=\"letter-spacing:10\">"
    114       RenderSVGText {text} at (50,358) size 93x27 contains 1 chunk(s)
     114      RenderSVGText {text} at (50,358) size 93x28 contains 1 chunk(s)
    115115        RenderSVGTSpan {tspan} at (0,0) size 93x27
    116116          RenderSVGInlineText {#text} at (0,0) size 93x27
     
    121121            chunk 1 text run 5 at (131.00,380.00) startOffset 4 endOffset 5 width 12.00: "k"
    122122        RenderSVGTSpan {tspan} at (0,0) size 0x1
    123       RenderSVGText {text} at (50,390) size 94x12 contains 1 chunk(s)
     123      RenderSVGText {text} at (50,390) size 94x13 contains 1 chunk(s)
    124124        RenderSVGInlineText {#text} at (0,0) size 94x12
    125125          chunk 1 text run 1 at (50.00,400.00) startOffset 0 endOffset 20 width 94.00: "Empty Trailing tspan"
    126       RenderSVGText {text} at (240,358) size 133x27 contains 1 chunk(s)
     126      RenderSVGText {text} at (240,358) size 133x28 contains 1 chunk(s)
    127127        RenderSVGTSpan {tspan} at (0,0) size 0x0
    128128        RenderSVGTSpan {tspan} at (0,0) size 133x27
     
    133133            chunk 1 text run 4 at (336.00,380.00) startOffset 3 endOffset 4 width 5.00: "i"
    134134            chunk 1 text run 5 at (361.00,380.00) startOffset 4 endOffset 5 width 12.00: "k"
    135       RenderSVGText {text} at (240,390) size 114x12 contains 1 chunk(s)
     135      RenderSVGText {text} at (240,390) size 114x13 contains 1 chunk(s)
    136136        RenderSVGInlineText {#text} at (0,0) size 114x12
    137137          chunk 1 text run 1 at (240.00,400.00) startOffset 0 endOffset 22 width 114.00: "Empty Preceeding tspan"
  • trunk/LayoutTests/platform/mac/svg/batik/text/verticalText-expected.txt

    r149210 r168350  
    66      RenderSVGPath {path} at (14,0) size 317x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 0 1000 100 C 1100 200 1200 300 1300 200 C 1400 100 1500 0 1600 100 C 1700 200 1800 300 1900 200 C 2000 100 2100 0 2200 100"]
    77    RenderSVGContainer {g} at (20,25) size 410x470
    8       RenderSVGText {text} at (163,25) size 124x18 contains 1 chunk(s)
     8      RenderSVGText {text} at (163,25) size 124x19 contains 1 chunk(s)
    99        RenderSVGInlineText {#text} at (0,0) size 124x18
    1010          chunk 1 (middle anchor) text run 1 at (163.00,40.00) startOffset 0 endOffset 18 width 124.00: "Vertical Text Test"
     
    2727        RenderSVGPath {line} at (349,75) size 2x375 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=350.00] [y1=75.00] [x2=350.00] [y2=450.00]
    2828        RenderSVGPath {line} at (399,75) size 2x375 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=400.00] [y1=75.00] [x2=400.00] [y2=450.00]
    29       RenderSVGText {text} at (41,75) size 17x169 contains 1 chunk(s)
     29      RenderSVGText {text} at (41,75) size 18x169 contains 1 chunk(s)
    3030        RenderSVGInlineText {#text} at (0,0) size 17x169
    3131          chunk 1 (vertical) text run 1 at (45.25,75.00) startOffset 0 endOffset 1 height 17.00: "W"
     
    5252          chunk 1 (vertical) text run 22 at (45.25,210.00) startOffset 21 endOffset 22 height 17.00: "\x{753B}"
    5353          chunk 1 (vertical) text run 23 at (45.25,227.00) startOffset 22 endOffset 23 height 17.00: "\x{50CF}"
    54       RenderSVGText {text} at (91,75) size 17x178 contains 1 chunk(s)
     54      RenderSVGText {text} at (91,75) size 18x178 contains 1 chunk(s)
    5555        RenderSVGInlineText {#text} at (0,0) size 17x178
    5656          chunk 1 (vertical) text run 1 at (95.25,75.00) startOffset 0 endOffset 1 height 17.00: "G"
     
    7878          chunk 1 (vertical) text run 23 at (95.25,219.00) startOffset 22 endOffset 23 height 17.00: "\x{753B}"
    7979          chunk 1 (vertical) text run 24 at (95.25,236.00) startOffset 23 endOffset 24 height 17.00: "\x{50CF}"
    80       RenderSVGText {text} at (142,75) size 15x357 contains 1 chunk(s)
     80      RenderSVGText {text} at (142,75) size 16x357 contains 1 chunk(s)
    8181        RenderSVGInlineText {#text} at (0,0) size 15x357
    8282          chunk 1 (vertical) text run 1 at (145.25,75.00) startOffset 0 endOffset 1 height 17.00: "G"
     
    101101          chunk 1 (vertical) text run 20 at (145.25,398.00) startOffset 19 endOffset 20 height 17.00: "\x{753B}"
    102102          chunk 1 (vertical) text run 21 at (145.25,415.00) startOffset 20 endOffset 21 height 17.00: "\x{50CF}"
    103       RenderSVGText {text} at (191,75) size 17x163 contains 1 chunk(s)
     103      RenderSVGText {text} at (191,75) size 18x163 contains 1 chunk(s)
    104104        RenderSVGInlineText {#text} at (0,0) size 17x163
    105105          chunk 1 (vertical) text run 1 at (195.25,75.00) startOffset 0 endOffset 1 height 17.00: "G"
     
    125125          chunk 1 (vertical) text run 21 at (195.25,208.00) startOffset 20 endOffset 21 height 17.00: "\x{753B}"
    126126          chunk 1 (vertical) text run 22 at (195.25,223.00) startOffset 21 endOffset 22 height 17.00: "\x{50CF}"
    127       RenderSVGText {text} at (242,71) size 15x391 contains 1 chunk(s)
     127      RenderSVGText {text} at (242,71) size 16x392 contains 1 chunk(s)
    128128        RenderSVGInlineText {#text} at (0,0) size 15x391
    129129          chunk 1 (vertical) text run 1 at (245.25,75.00) startOffset 0 endOffset 1 height 17.00: "G"
     
    150150          chunk 1 (vertical) text run 22 at (245.25,432.00) startOffset 21 endOffset 22 height 17.00: "\x{753B}"
    151151          chunk 1 (vertical) text run 23 at (245.25,449.00) startOffset 22 endOffset 23 height 17.00: "\x{50CF}"
    152       RenderSVGText {text} at (291,75) size 17x171 contains 1 chunk(s)
     152      RenderSVGText {text} at (291,75) size 18x171 contains 1 chunk(s)
    153153        RenderSVGInlineText {#text} at (0,0) size 17x171
    154154          chunk 1 (vertical) text run 1 at (295.25,75.00) startOffset 0 endOffset 1 height 17.00: "G"
     
    175175          chunk 1 (vertical) text run 22 at (295.25,216.00) startOffset 21 endOffset 22 height 17.00: "\x{753B}"
    176176          chunk 1 (vertical) text run 23 at (295.25,231.00) startOffset 22 endOffset 23 height 17.00: "\x{50CF}"
    177       RenderSVGText {text} at (341,75) size 17x173 contains 1 chunk(s)
     177      RenderSVGText {text} at (341,75) size 18x173 contains 1 chunk(s)
    178178        RenderSVGInlineText {#text} at (0,0) size 17x71
    179179          chunk 1 (vertical) text run 1 at (345.25,75.00) startOffset 0 endOffset 1 height 17.00: "E"
     
    204204          chunk 1 (vertical) text run 7 at (345.25,236.00) startOffset 6 endOffset 7 height 17.00: "n"
    205205          chunk 1 (vertical) text run 8 at (345.25,244.00) startOffset 7 endOffset 8 height 17.00: "t"
    206       RenderSVGText {text} at (391,75) size 17x294 contains 1 chunk(s)
     206      RenderSVGText {text} at (391,75) size 18x294 contains 1 chunk(s)
    207207        RenderSVGInlineText {#text} at (0,0) size 17x71
    208208          chunk 1 (vertical) text run 1 at (395.25,75.00) startOffset 0 endOffset 1 height 17.00: "E"
     
    239239        RenderSVGContainer {use} at (54,450) size 317x45
    240240          RenderSVGPath {path} at (54,450) size 317x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 0 1000 100 C 1100 200 1200 300 1300 200 C 1400 100 1500 0 1600 100 C 1700 200 1800 300 1900 200 C 2000 100 2100 0 2200 100"]
    241         RenderSVGText {text} at (11,5) size 296x35 contains 1 chunk(s)
     241        RenderSVGText {text} at (11,5) size 297x36 contains 1 chunk(s)
    242242          RenderSVGTextPath {textPath} at (0,0) size 296x35
    243243            RenderSVGInlineText {#text} at (0,0) size 296x35
  • trunk/LayoutTests/platform/mac/svg/batik/text/verticalTextOnPath-expected.txt

    r110676 r168350  
    44  RenderSVGRoot {svg} at (0,0) size 448x498
    55    RenderSVGContainer {g} at (9,25) size 438x458
    6       RenderSVGText {text} at (134,25) size 182x18 contains 1 chunk(s)
     6      RenderSVGText {text} at (134,25) size 182x19 contains 1 chunk(s)
    77        RenderSVGInlineText {#text} at (0,0) size 182x18
    88          chunk 1 (middle anchor) text run 1 at (134.00,40.00) startOffset 0 endOffset 28 width 182.00: "Vertical text on a path test"
     
    1313        RenderSVGContainer {use} at (14,70) size 121x45
    1414          RenderSVGPath {path} at (14,70) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    15         RenderSVGText {text} at (9,-10) size 83x54 contains 1 chunk(s)
     15        RenderSVGText {text} at (9,-10) size 83x55 contains 1 chunk(s)
    1616          RenderSVGTextPath {textPath} at (0,0) size 83x54
    1717            RenderSVGInlineText {#text} at (0,12) size 35x34
     
    3535                chunk 1 (vertical) text run 7 at (84.77,34.76) startOffset 6 endOffset 7 height 17.00: "h"
    3636          RenderSVGInlineText {#text} at (0,0) size 0x0
    37         RenderSVGText {text} at (35,50) size 68x12 contains 1 chunk(s)
     37        RenderSVGText {text} at (35,50) size 68x13 contains 1 chunk(s)
    3838          RenderSVGInlineText {#text} at (0,0) size 68x12
    3939            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 68.00: "startOffset=\"0%\""
    40         RenderSVGText {text} at (35,60) size 75x12 contains 1 chunk(s)
     40        RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
    4141          RenderSVGInlineText {#text} at (0,0) size 75x12
    4242            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
    43         RenderSVGText {text} at (35,70) size 100x12 contains 1 chunk(s)
     43        RenderSVGText {text} at (35,70) size 100x13 contains 1 chunk(s)
    4444          RenderSVGInlineText {#text} at (0,0) size 100x12
    4545            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
     
    6262                chunk 1 (middle anchor, vertical) text run 7 at (106.64,28.41) startOffset 6 endOffset 7 height 17.00: "h"
    6363          RenderSVGInlineText {#text} at (0,0) size 0x0
    64         RenderSVGText {text} at (35,50) size 68x12 contains 1 chunk(s)
     64        RenderSVGText {text} at (35,50) size 68x13 contains 1 chunk(s)
    6565          RenderSVGInlineText {#text} at (0,0) size 68x12
    6666            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 68.00: "startOffset=\"0%\""
    67         RenderSVGText {text} at (35,60) size 86x12 contains 1 chunk(s)
     67        RenderSVGText {text} at (35,60) size 86x13 contains 1 chunk(s)
    6868          RenderSVGInlineText {#text} at (0,0) size 86x12
    6969            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
    70         RenderSVGText {text} at (35,70) size 102x12 contains 1 chunk(s)
     70        RenderSVGText {text} at (35,70) size 102x13 contains 1 chunk(s)
    7171          RenderSVGInlineText {#text} at (0,0) size 102x12
    7272            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\""
     
    7474        RenderSVGContainer {use} at (314,70) size 121x45
    7575          RenderSVGPath {path} at (314,70) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    76         RenderSVGText {text} at (11,3) size 61x30 contains 1 chunk(s)
     76        RenderSVGText {text} at (11,3) size 62x31 contains 1 chunk(s)
    7777          RenderSVGTextPath {textPath} at (0,0) size 61x30
    7878            RenderSVGInlineText {#text} at (-11,-3) size 0x0
     
    8686                chunk 1 (end anchor, vertical) text run 4 at (66.14,21.06) startOffset 6 endOffset 7 height 17.00: "h"
    8787          RenderSVGInlineText {#text} at (0,0) size 0x0
    88         RenderSVGText {text} at (35,50) size 73x12 contains 1 chunk(s)
     88        RenderSVGText {text} at (35,50) size 73x13 contains 1 chunk(s)
    8989          RenderSVGInlineText {#text} at (0,0) size 73x12
    9090            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 73.00: "startOffset=\"50%\""
    91         RenderSVGText {text} at (35,60) size 72x12 contains 1 chunk(s)
     91        RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
    9292          RenderSVGInlineText {#text} at (0,0) size 72x12
    9393            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
    94         RenderSVGText {text} at (35,70) size 112x12 contains 1 chunk(s)
     94        RenderSVGText {text} at (35,70) size 112x13 contains 1 chunk(s)
    9595          RenderSVGInlineText {#text} at (0,0) size 112x12
    9696            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\""
     
    9898        RenderSVGContainer {use} at (14,170) size 121x45
    9999          RenderSVGPath {path} at (14,170) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    100         RenderSVGText {text} at (67,6) size 70x39 contains 1 chunk(s)
     100        RenderSVGText {text} at (67,6) size 70x40 contains 1 chunk(s)
    101101          RenderSVGTextPath {textPath} at (0,0) size 70x39
    102102            RenderSVGInlineText {#text} at (0,13) size 39x25
     
    117117                chunk 1 (vertical) text run 4 at (130.80,15.51) startOffset 3 endOffset 4 height 17.00: "P"
    118118          RenderSVGInlineText {#text} at (0,0) size 0x0
    119         RenderSVGText {text} at (35,50) size 73x12 contains 1 chunk(s)
     119        RenderSVGText {text} at (35,50) size 73x13 contains 1 chunk(s)
    120120          RenderSVGInlineText {#text} at (0,0) size 73x12
    121121            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 73.00: "startOffset=\"50%\""
    122         RenderSVGText {text} at (35,60) size 75x12 contains 1 chunk(s)
     122        RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
    123123          RenderSVGInlineText {#text} at (0,0) size 75x12
    124124            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
    125         RenderSVGText {text} at (35,70) size 112x12 contains 1 chunk(s)
     125        RenderSVGText {text} at (35,70) size 112x13 contains 1 chunk(s)
    126126          RenderSVGInlineText {#text} at (0,0) size 112x12
    127127            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"270deg\""
     
    129129        RenderSVGContainer {use} at (164,170) size 121x45
    130130          RenderSVGPath {path} at (164,170) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    131         RenderSVGText {text} at (15,-7) size 118x48 contains 1 chunk(s)
     131        RenderSVGText {text} at (15,-7) size 118x49 contains 1 chunk(s)
    132132          RenderSVGTextPath {textPath} at (0,0) size 118x48
    133133            RenderSVGInlineText {#text} at (0,11) size 30x24
     
    145145                chunk 1 (middle anchor, vertical) text run 4 at (123.61,17.60) startOffset 3 endOffset 4 height 17.00: "P"
    146146          RenderSVGInlineText {#text} at (0,0) size 0x0
    147         RenderSVGText {text} at (35,50) size 73x12 contains 1 chunk(s)
     147        RenderSVGText {text} at (35,50) size 73x13 contains 1 chunk(s)
    148148          RenderSVGInlineText {#text} at (0,0) size 73x12
    149149            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 17 width 73.00: "startOffset=\"50%\""
    150         RenderSVGText {text} at (35,60) size 86x12 contains 1 chunk(s)
     150        RenderSVGText {text} at (35,60) size 86x13 contains 1 chunk(s)
    151151          RenderSVGInlineText {#text} at (0,0) size 86x12
    152152            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
    153         RenderSVGText {text} at (35,70) size 102x12 contains 1 chunk(s)
     153        RenderSVGText {text} at (35,70) size 102x13 contains 1 chunk(s)
    154154          RenderSVGInlineText {#text} at (0,0) size 102x12
    155155            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\""
     
    179179                chunk 1 (end anchor, vertical) text run 7 at (122.44,18.07) startOffset 6 endOffset 7 height 17.00: "h"
    180180          RenderSVGInlineText {#text} at (0,0) size 0x0
    181         RenderSVGText {text} at (35,50) size 78x12 contains 1 chunk(s)
     181        RenderSVGText {text} at (35,50) size 78x13 contains 1 chunk(s)
    182182          RenderSVGInlineText {#text} at (0,0) size 78x12
    183183            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 18 width 78.00: "startOffset=\"100%\""
    184         RenderSVGText {text} at (35,60) size 72x12 contains 1 chunk(s)
     184        RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
    185185          RenderSVGInlineText {#text} at (0,0) size 72x12
    186186            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
    187         RenderSVGText {text} at (35,70) size 107x12 contains 1 chunk(s)
     187        RenderSVGText {text} at (35,70) size 107x13 contains 1 chunk(s)
    188188          RenderSVGInlineText {#text} at (0,0) size 107x12
    189189            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\""
     
    191191        RenderSVGContainer {use} at (14,270) size 121x45
    192192          RenderSVGPath {path} at (14,270) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    193         RenderSVGText {text} at (38,1) size 86x38 contains 1 chunk(s)
     193        RenderSVGText {text} at (38,1) size 86x39 contains 1 chunk(s)
    194194          RenderSVGTextPath {textPath} at (0,0) size 86x38
    195195            RenderSVGInlineText {#text} at (0,0) size 75x38
     
    205205              RenderSVGInlineText {#text} at (-38,-1) size 0x0
    206206          RenderSVGInlineText {#text} at (0,0) size 0x0
    207         RenderSVGText {text} at (35,50) size 65x12 contains 1 chunk(s)
     207        RenderSVGText {text} at (35,50) size 65x13 contains 1 chunk(s)
    208208          RenderSVGInlineText {#text} at (0,0) size 65x12
    209209            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 65.00: "startOffset=\"35\""
    210         RenderSVGText {text} at (35,60) size 75x12 contains 1 chunk(s)
     210        RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
    211211          RenderSVGInlineText {#text} at (0,0) size 75x12
    212212            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
    213         RenderSVGText {text} at (35,70) size 112x12 contains 1 chunk(s)
     213        RenderSVGText {text} at (35,70) size 112x13 contains 1 chunk(s)
    214214          RenderSVGInlineText {#text} at (0,0) size 112x12
    215215            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\""
     
    217217        RenderSVGContainer {use} at (164,270) size 121x45
    218218          RenderSVGPath {path} at (164,270) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    219         RenderSVGText {text} at (10,-8) size 72x44 contains 1 chunk(s)
     219        RenderSVGText {text} at (10,-8) size 72x45 contains 1 chunk(s)
    220220          RenderSVGTextPath {textPath} at (0,0) size 72x44
    221221            RenderSVGInlineText {#text} at (0,18) size 24x24
     
    237237                chunk 1 (middle anchor, vertical) text run 7 at (72.62,26.96) startOffset 6 endOffset 7 height 17.00: "h"
    238238          RenderSVGInlineText {#text} at (0,0) size 0x0
    239         RenderSVGText {text} at (35,50) size 65x12 contains 1 chunk(s)
     239        RenderSVGText {text} at (35,50) size 65x13 contains 1 chunk(s)
    240240          RenderSVGInlineText {#text} at (0,0) size 65x12
    241241            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 65.00: "startOffset=\"35\""
    242         RenderSVGText {text} at (35,60) size 86x12 contains 1 chunk(s)
     242        RenderSVGText {text} at (35,60) size 86x13 contains 1 chunk(s)
    243243          RenderSVGInlineText {#text} at (0,0) size 86x12
    244244            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
     
    246246        RenderSVGContainer {use} at (314,270) size 121x45
    247247          RenderSVGPath {path} at (314,270) size 121x45 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"]
    248         RenderSVGText {text} at (8,5) size 32x31 contains 1 chunk(s)
     248        RenderSVGText {text} at (8,5) size 32x32 contains 1 chunk(s)
    249249          RenderSVGTextPath {textPath} at (0,0) size 32x31
    250250            RenderSVGInlineText {#text} at (-8,-5) size 0x0
     
    258258                chunk 1 (end anchor, vertical) text run 4 at (31.23,15.18) startOffset 6 endOffset 7 height 17.00: "h"
    259259          RenderSVGInlineText {#text} at (0,0) size 0x0
    260         RenderSVGText {text} at (35,50) size 65x12 contains 1 chunk(s)
     260        RenderSVGText {text} at (35,50) size 65x13 contains 1 chunk(s)
    261261          RenderSVGInlineText {#text} at (0,0) size 65x12
    262262            chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 65.00: "startOffset=\"35\""
    263         RenderSVGText {text} at (35,60) size 72x12 contains 1 chunk(s)
     263        RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
    264264          RenderSVGInlineText {#text} at (0,0) size 72x12
    265265            chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
    266         RenderSVGText {text} at (35,70) size 107x12 contains 1 chunk(s)
     266        RenderSVGText {text} at (35,70) size 107x13 contains 1 chunk(s)
    267267          RenderSVGInlineText {#text} at (0,0) size 107x12
    268268            chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\""
    269       RenderSVGContainer {g} at (22,370) size 117x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}]
    270         RenderSVGContainer {use} at (39,370) size 92x50
    271           RenderSVGPath {path} at (39,370) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    272         RenderSVGText {text} at (12,3) size 116x47 contains 1 chunk(s)
     269      RenderSVGContainer {g} at (22,369) size 117x89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}]
     270        RenderSVGContainer {use} at (39,369) size 92x51
     271          RenderSVGPath {path} at (39,369) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     272        RenderSVGText {text} at (12,3) size 117x47 contains 1 chunk(s)
    273273          RenderSVGTextPath {textPath} at (0,0) size 116x47
    274274            RenderSVGTSpan {tspan} at (0,0) size 33x44
     
    299299              chunk 1 (vertical) text run 7 at (119.36,42.93) startOffset 6 endOffset 7 height 17.00: "s"
    300300          RenderSVGInlineText {#text} at (0,0) size 0x0
    301         RenderSVGText {text} at (20,55) size 88x12 contains 1 chunk(s)
     301        RenderSVGText {text} at (20,55) size 88x13 contains 1 chunk(s)
    302302          RenderSVGInlineText {#text} at (0,0) size 88x12
    303303            chunk 1 text run 1 at (20.00,65.00) startOffset 0 endOffset 22 width 88.00: "baseline-shift=\"super\""
    304         RenderSVGText {text} at (20,65) size 98x12 contains 1 chunk(s)
     304        RenderSVGText {text} at (20,65) size 98x13 contains 1 chunk(s)
    305305          RenderSVGInlineText {#text} at (0,0) size 98x12
    306306            chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 98.00: "and baseline-shift=\"sub\""
    307         RenderSVGText {text} at (20,75) size 100x12 contains 1 chunk(s)
     307        RenderSVGText {text} at (20,75) size 100x13 contains 1 chunk(s)
    308308          RenderSVGInlineText {#text} at (0,0) size 100x12
    309309            chunk 1 text run 1 at (20.00,85.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
    310       RenderSVGContainer {g} at (318,370) size 108x78 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,370.00)}]
    311         RenderSVGContainer {use} at (329,370) size 92x50
    312           RenderSVGPath {path} at (329,370) size 92x50 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    313         RenderSVGText {text} at (18,3) size 108x49 contains 1 chunk(s)
     310      RenderSVGContainer {g} at (318,369) size 108x79 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,370.00)}]
     311        RenderSVGContainer {use} at (329,369) size 92x51
     312          RenderSVGPath {path} at (329,369) size 92x51 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     313        RenderSVGText {text} at (18,3) size 108x50 contains 1 chunk(s)
    314314          RenderSVGTextPath {textPath} at (0,0) size 108x49
    315315            RenderSVGTSpan {tspan} at (0,0) size 43x47
     
    340340                chunk 1 (vertical) text run 8 at (119.97,48.39) startOffset 7 endOffset 8 height 17.00: "e"
    341341          RenderSVGInlineText {#text} at (0,0) size 0x0
    342         RenderSVGText {text} at (20,55) size 97x12 contains 1 chunk(s)
     342        RenderSVGText {text} at (20,55) size 97x13 contains 1 chunk(s)
    343343          RenderSVGInlineText {#text} at (0,0) size 97x12
    344344            chunk 1 text run 1 at (20.00,65.00) startOffset 0 endOffset 23 width 97.00: "baseline-shift=\"+/-20%\""
    345         RenderSVGText {text} at (20,65) size 100x12 contains 1 chunk(s)
     345        RenderSVGText {text} at (20,65) size 100x13 contains 1 chunk(s)
    346346          RenderSVGInlineText {#text} at (0,0) size 100x12
    347347            chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
    348348      RenderSVGContainer {g} at (178,355) size 102x128 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,370.00)}]
    349         RenderSVGContainer {g} at (178,355) size 93x93 [transform={m=((0.75,0.00)(0.00,0.75)) t=(0.00,0.00)}]
    350           RenderSVGContainer {use} at (202,370) size 69x38
    351             RenderSVGPath {path} at (202,370) size 69x38 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
    352           RenderSVGText {text} at (-2,-20) size 93x123 contains 1 chunk(s)
     349        RenderSVGContainer {g} at (178,355) size 93x92 [transform={m=((0.75,0.00)(0.00,0.75)) t=(0.00,0.00)}]
     350          RenderSVGContainer {use} at (202,369) size 69x39
     351            RenderSVGPath {path} at (202,369) size 69x39 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M 100 100 C 100 0 400 0 400 100"]
     352          RenderSVGText {text} at (-2,-20) size 94x123 contains 1 chunk(s)
    353353            RenderSVGInlineText {#text} at (0,0) size 23x100
    354354              chunk 1 (vertical) text run 1 at (3.50,-20.00) startOffset 0 endOffset 1 height 22.67: "b"
     
    384384              chunk 1 (vertical) text run 9 at (73.38,86.03) startOffset 8 endOffset 9 height 22.67: "t"
    385385              chunk 1 (vertical) text run 10 at (73.38,91.36) startOffset 9 endOffset 10 height 22.67: "h"
    386         RenderSVGText {text} at (0,90) size 98x12 contains 1 chunk(s)
     386        RenderSVGText {text} at (0,90) size 98x13 contains 1 chunk(s)
    387387          RenderSVGInlineText {#text} at (0,0) size 98x12
    388388            chunk 1 text run 1 at (0.00,100.00) startOffset 0 endOffset 26 width 98.00: "text before/after textPath"
    389         RenderSVGText {text} at (0,100) size 100x12 contains 1 chunk(s)
     389        RenderSVGText {text} at (0,100) size 100x13 contains 1 chunk(s)
    390390          RenderSVGInlineText {#text} at (0,0) size 100x12
    391391            chunk 1 text run 1 at (0.00,110.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
  • trunk/LayoutTests/platform/mac/svg/custom/bug45331-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 800x600
    2   RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x169
    4   RenderBlock {html} at (0,0) size 800x169
    5     RenderBody {body} at (8,16) size 784x137
    6       RenderBlock {parsererror} at (16,0) size 752x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
    7         RenderBlock {h3} at (18,20) size 716x23
     1layer at (0,0) size 785x616
     2  RenderView at (0,0) size 785x600
     3layer at (0,0) size 785x600
     4  RenderBlock {html} at (0,0) size 785x600
     5    RenderBody {body} at (8,16) size 769x600
     6      RenderBlock {parsererror} at (16,0) size 737x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
     7        RenderBlock {h3} at (18,20) size 701x23
    88          RenderText {#text} at (0,0) size 324x22
    99            text run at (0,0) width 324: "This page contains the following errors:"
    10         RenderBlock {div} at (18,61) size 716x15
     10        RenderBlock {div} at (18,61) size 701x15
    1111          RenderText {#text} at (0,0) size 483x14
    1212            text run at (0,0) width 483: "error on line 3 at column 1: Extra content at the end of the document"
    1313            text run at (483,0) width 0: " "
    14         RenderBlock {h3} at (18,94) size 716x23
     14        RenderBlock {h3} at (18,94) size 701x23
    1515          RenderText {#text} at (0,0) size 429x22
    1616            text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
  • trunk/LayoutTests/platform/mac/svg/custom/junk-data-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 785x781
     1layer at (0,0) size 785x773
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x781
    4   RenderBlock {html} at (0,0) size 785x781
    5     RenderBody {body} at (8,16) size 769x757
     3layer at (0,0) size 785x600
     4  RenderBlock {html} at (0,0) size 785x600
     5    RenderBody {body} at (8,16) size 769x600
    66      RenderBlock {parsererror} at (16,0) size 737x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
    77        RenderBlock {h3} at (18,20) size 701x23
  • trunk/LayoutTests/platform/mac/svg/custom/missing-xlink-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 785x781
     1layer at (0,0) size 785x773
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x781
    4   RenderBlock {html} at (0,0) size 785x781
    5     RenderBody {body} at (8,16) size 769x757
     3layer at (0,0) size 785x600
     4  RenderBlock {html} at (0,0) size 785x600
     5    RenderBody {body} at (8,16) size 769x600
    66      RenderBlock {parsererror} at (16,0) size 737x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
    77        RenderBlock {h3} at (18,20) size 701x23
  • trunk/LayoutTests/platform/mac/svg/custom/path-bad-data-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 808x781
    2   RenderView at (0,0) size 785x585
    3 layer at (0,0) size 785x781
    4   RenderBlock {html} at (0,0) size 785x781
    5     RenderBody {body} at (8,16) size 769x757
     1layer at (0,0) size 785x773
     2  RenderView at (0,0) size 785x600
     3layer at (0,0) size 785x600
     4  RenderBlock {html} at (0,0) size 785x600
     5    RenderBody {body} at (8,16) size 769x600
    66      RenderBlock {parsererror} at (16,0) size 737x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
    77        RenderBlock {h3} at (18,20) size 701x23
  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt

    r161884 r168350  
    8181          text run at (12,111) width 350: "and invigorating fashion. Become one with the web."
    8282    RenderText {#text} at (0,0) size 0x0
    83 layer at (321,235) size 306x80
    84   RenderBlock (positioned) {H3} at (148,-116) size 306x81 [color=#CCCC77] [bgcolor=#888811] [border: (3px solid #888811) none (3px solid #888811)]
     83layer at (321,234) size 307x81
     84  RenderBlock (positioned) {H3} at (147,-118) size 307x83 [color=#CCCC77] [bgcolor=#888811] [border: (3.77px solid #888811) none (3.77px solid #888811)]
    8585    RenderInline {SPAN} at (0,0) size 277x83
    86       RenderText {#text} at (45,-2) size 277x83
    87         text run at (45,-2) width 230: "The Road to"
    88         text run at (3,35) width 277: "Enlightenment"
     86      RenderText {#text} at (45,-1) size 277x83
     87        text run at (45,-1) width 230: "The Road to"
     88        text run at (4,36) width 277: "Enlightenment"
  • trunk/LayoutTests/platform/mac/svg/custom/use-font-face-crash-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 785x781
     1layer at (0,0) size 785x773
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x781
    4   RenderBlock {html} at (0,0) size 785x781
    5     RenderBody {body} at (8,16) size 769x757
     3layer at (0,0) size 785x600
     4  RenderBlock {html} at (0,0) size 785x600
     5    RenderBody {body} at (8,16) size 769x600
    66      RenderBlock {parsererror} at (16,0) size 737x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
    77        RenderBlock {h3} at (18,20) size 701x23
  • trunk/LayoutTests/platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt

    r103407 r168350  
    44  RenderSVGRoot {svg} at (0,0) size 300x100
    55    RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
    6       RenderBlock {html} at (0,0) size 300x638
     6      RenderBlock {html} at (0,0) size 300x188
    77        RenderBlock {p} at (0,0) size 300x18
    88          RenderText {#text} at (0,0) size 218x18
    99            text run at (0,0) width 218: "Test from HTML in foreignObject"
    10         RenderBlock (anonymous) at (0,34) size 300x604
     10        RenderBlock (anonymous) at (0,34) size 300x154
    1111          RenderSVGRoot {svg} at (0,34) size 271x54
    1212            RenderSVGRect {rect} at (0,34) size 20x20 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=20.00] [height=20.00]
  • trunk/LayoutTests/platform/mac/svg/hixie/error/012-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 785x781
     1layer at (0,0) size 785x773
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x781
    4   RenderBlock {html} at (0,0) size 785x781
    5     RenderBody {body} at (8,16) size 769x757
     3layer at (0,0) size 785x600
     4  RenderBlock {html} at (0,0) size 785x600
     5    RenderBody {body} at (8,16) size 769x600
    66      RenderBlock {parsererror} at (16,0) size 737x137 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
    77        RenderBlock {h3} at (18,20) size 701x23
  • trunk/LayoutTests/platform/mac/svg/in-html/circle-expected.txt

    r112667 r168350  
    1 layer at (0,0) size 785x662
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x662
    4   RenderBlock {HTML} at (0,0) size 785x662
    5     RenderBody {BODY} at (8,16) size 769x638
    6       RenderBlock {P} at (0,0) size 769x18
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x212
     4  RenderBlock {HTML} at (0,0) size 800x212
     5    RenderBody {BODY} at (8,16) size 784x188
     6      RenderBlock {P} at (0,0) size 784x18
    77        RenderText {#text} at (0,0) size 188x18
    88          text run at (0,0) width 188: "This circle is drawn via SVG."
    9       RenderBlock (anonymous) at (0,34) size 769x604
     9      RenderBlock (anonymous) at (0,34) size 784x154
    1010        RenderSVGRoot {svg} at (8,50) size 40x40
    1111          RenderSVGEllipse {circle} at (8,50) size 40x40 [fill={[type=SOLID] [color=#008000]}] [cx=20.00] [cy=20.00] [r=20.00]
  • trunk/LayoutTests/platform/mac/svg/transforms/animated-path-inside-transformed-html-expected.txt

    r161884 r168350  
    99layer at (58,84) size 402x402
    1010  RenderBlock {div} at (50,68) size 402x402 [border: (1px solid #000000)]
    11     RenderSVGRoot {svg} at (148,144) size 358x419
    12       RenderSVGRect {rect} at (355,187) size 115x115 [stroke={[type=SOLID] [color=#FFC0CB] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=0.00] [width=100.00] [height=100.00]
     11    RenderSVGRoot {svg} at (165,100) size 357x416
     12      RenderSVGRect {rect} at (372,143) size 114x112 [stroke={[type=SOLID] [color=#FFC0CB] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=0.00] [width=100.00] [height=100.00]
    1313      RenderSVGText {text} at (150,281) size 143x25 contains 1 chunk(s)
    1414        RenderSVGInlineText {#text} at (0,0) size 143x24
    1515          chunk 1 text run 1 at (150.00,300.00) startOffset 0 endOffset 17 width 142.80: "This is some text"
    16       RenderSVGImage {image} at (306,455) size 108x108
     16      RenderSVGImage {image} at (323,408) size 108x108
    1717    RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.txt

    r105061 r168350  
    1010layer at (58,84) size 402x402
    1111  RenderBlock {div} at (50,68) size 402x402 [border: (1px solid #000000)]
    12     RenderSVGRoot {svg} at (49,105) size 480x420
     12    RenderSVGRoot {svg} at (66,58) size 480x420
    1313      RenderSVGResourcePattern {pattern} [id="pat1"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
    14         RenderSVGRect {rect} at (151,110) size 13x13 [fill={[type=SOLID] [color=#FF0000]}] [x=5.00] [y=5.00] [width=10.00] [height=10.00]
    15         RenderSVGRect {rect} at (154,115) size 12x13 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
    16       RenderSVGRect {rect} at (150,119) size 358x173 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pat1"]}] [x=25.00] [y=10.00] [width=430.00] [height=60.00]
     14        RenderSVGRect {rect} at (168,63) size 13x13 [fill={[type=SOLID] [color=#FF0000]}] [x=5.00] [y=5.00] [width=10.00] [height=10.00]
     15        RenderSVGRect {rect} at (171,68) size 12x13 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
     16      RenderSVGRect {rect} at (168,72) size 357x173 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="pat1"]}] [x=25.00] [y=10.00] [width=430.00] [height=60.00]
    1717      RenderSVGText {text} at (25,74) size 407x14 contains 1 chunk(s)
    1818        RenderSVGInlineText {#text} at (0,0) size 407x14
    1919          chunk 1 text run 1 at (25.00,85.00) startOffset 0 endOffset 75 width 406.80: "Pattern created using red and green rectangles applied to fill of rectangle"
    2020      RenderSVGResourcePattern {pattern} [id="pat2"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
    21         RenderSVGRect {rect} at (149,105) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
    22         RenderSVGRect {rect} at (156,108) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
    23         RenderSVGRect {rect} at (146,113) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
    24         RenderSVGRect {rect} at (154,115) size 12x13 [fill={[type=SOLID] [color=#FFFF00]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
    25       RenderSVGRect {rect} at (125,190) size 357x172 [stroke={[type=PATTERN] [id="pat2"] [stroke width=20.00]}] [x=35.00] [y=110.00] [width=410.00] [height=40.00]
     21        RenderSVGRect {rect} at (166,58) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
     22        RenderSVGRect {rect} at (173,61) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
     23        RenderSVGRect {rect} at (163,66) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
     24        RenderSVGRect {rect} at (171,68) size 12x13 [fill={[type=SOLID] [color=#FFFF00]}] [x=10.00] [y=10.00] [width=10.00] [height=10.00]
     25      RenderSVGRect {rect} at (142,143) size 357x172 [stroke={[type=PATTERN] [id="pat2"] [stroke width=20.00]}] [x=35.00] [y=110.00] [width=410.00] [height=40.00]
    2626      RenderSVGText {text} at (25,164) size 319x14 contains 1 chunk(s)
    2727        RenderSVGInlineText {#text} at (0,0) size 319x14
    2828          chunk 1 text run 1 at (25.00,175.00) startOffset 0 endOffset 59 width 318.00: "Pattern of 4 rectangles applied to a stroke of a rectangle."
    2929      RenderSVGResourcePattern {pattern} [id="pat3"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
    30         RenderSVGRect {rect} at (149,105) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
    31         RenderSVGRect {rect} at (146,113) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
     30        RenderSVGRect {rect} at (166,58) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
     31        RenderSVGRect {rect} at (163,66) size 13x12 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=10.00] [width=10.00] [height=10.00]
    3232      RenderSVGText {text} at (25,174) size 293x57 contains 1 chunk(s)
    3333        RenderSVGInlineText {#text} at (0,0) size 293x57
     
    3737          chunk 1 text run 1 at (25.00,235.00) startOffset 0 endOffset 38 width 214.80: "Pattern consists of red and green rows"
    3838      RenderSVGResourcePattern {pattern} [id="pat4"] [patternUnits=objectBoundingBox] [patternContentUnits=userSpaceOnUse]
    39         RenderSVGRect {rect} at (149,105) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
    40         RenderSVGRect {rect} at (156,108) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
     39        RenderSVGRect {rect} at (166,58) size 12x13 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=10.00] [height=10.00]
     40        RenderSVGRect {rect} at (173,61) size 13x12 [fill={[type=SOLID] [color=#0000FF]}] [x=10.00] [y=0.00] [width=10.00] [height=10.00]
    4141      RenderSVGText {text} at (25,239) size 299x45 contains 1 chunk(s)
    4242        RenderSVGInlineText {#text} at (0,0) size 299x45
     
    4848        RenderSVGInlineText {#text} at (0,0) size 264x46
    4949          chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 264.00: "$Revision: 1.6 $"
    50       RenderSVGRect {rect} at (49,105) size 480x420 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
     50      RenderSVGRect {rect} at (66,58) size 480x420 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
    5151    RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/wicd/rightsizing-grid-expected.txt

    r161884 r168350  
    4747                    RenderSVGGradientStop {stop} [offset=0.00] [color=#FFFFFF]
    4848                    RenderSVGGradientStop {stop} [offset=1.00] [color=#FFEEAA]
    49                 RenderSVGContainer {a} at (0,0) size 129x129
    50                   RenderSVGRect {rect} at (0,0) size 129x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=1.00] [y=1.00] [width=38.00] [height=38.00]
     49                RenderSVGContainer {a} at (0,0) size 128x129
     50                  RenderSVGRect {rect} at (0,0) size 128x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=1.00] [y=1.00] [width=38.00] [height=38.00]
    5151                  RenderSVGText {text} at (13,8) size 14x24 contains 1 chunk(s)
    5252                    RenderSVGInlineText {#text} at (0,0) size 14x24
    53                       chunk 1 (middle anchor) text run 1 at (13.29,27.00) startOffset 0 endOffset 1 width 13.42: "B"
     53                      chunk 1 (middle anchor) text run 1 at (13.28,27.00) startOffset 0 endOffset 1 width 13.44: "B"
    5454                RenderSVGContainer {a} at (128,0) size 128x129
    5555                  RenderSVGRect {rect} at (128,0) size 128x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=41.00] [y=1.00] [width=38.00] [height=38.00]
    56                 RenderSVGContainer {a} at (0,160) size 129x129
    57                   RenderSVGEllipse {circle} at (0,160) size 129x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [cx=20.00] [cy=70.00] [r=19.00]
     56                RenderSVGContainer {a} at (0,160) size 128x129
     57                  RenderSVGEllipse {circle} at (0,160) size 128x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [cx=20.00] [cy=70.00] [r=19.00]
    5858                  RenderSVGText {text} at (13,58) size 14x24 contains 1 chunk(s)
    5959                    RenderSVGInlineText {#text} at (0,0) size 14x24
    60                       chunk 1 (middle anchor) text run 1 at (13.29,77.00) startOffset 0 endOffset 1 width 13.42: "C"
     60                      chunk 1 (middle anchor) text run 1 at (13.28,77.00) startOffset 0 endOffset 1 width 13.44: "C"
    6161                RenderSVGContainer {a} at (128,160) size 128x129
    6262                  RenderSVGEllipse {circle} at (128,160) size 128x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [cx=60.00] [cy=70.00] [r=19.00]
    63                 RenderSVGContainer {a} at (0,320) size 129x129
    64                   RenderSVGEllipse {circle} at (0,320) size 129x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [cx=20.00] [cy=120.00] [r=19.00]
     63                RenderSVGContainer {a} at (0,320) size 128x129
     64                  RenderSVGEllipse {circle} at (0,320) size 128x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [cx=20.00] [cy=120.00] [r=19.00]
    6565                  RenderSVGText {text} at (12,108) size 16x24 contains 1 chunk(s)
    6666                    RenderSVGInlineText {#text} at (0,0) size 15x24
    67                       chunk 1 (middle anchor) text run 1 at (12.82,127.00) startOffset 0 endOffset 1 width 14.36: "D"
     67                      chunk 1 (middle anchor) text run 1 at (12.81,127.00) startOffset 0 endOffset 1 width 14.38: "D"
    6868                RenderSVGContainer {a} at (128,320) size 128x129
    6969                  RenderSVGEllipse {circle} at (128,320) size 128x129 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [cx=60.00] [cy=120.00] [r=19.00]
    7070                  RenderSVGText {text} at (53,108) size 14x24 contains 1 chunk(s)
    7171                    RenderSVGInlineText {#text} at (0,0) size 13x24
    72                       chunk 1 (middle anchor) text run 1 at (53.91,127.00) startOffset 0 endOffset 1 width 12.17: "E"
     72                      chunk 1 (middle anchor) text run 1 at (53.91,127.00) startOffset 0 endOffset 1 width 12.19: "E"
    7373          RenderBlock (floating) {div} at (256,128) size 257x448
    7474            RenderEmbeddedObject {object} at (0,0) size 257x256
     
    109109                      RenderSVGGradientStop {stop} [offset=0.00] [color=#FFFFFF]
    110110                      RenderSVGGradientStop {stop} [offset=1.00] [color=#FFEEAA]
    111                   RenderSVGContainer {a} at (0,0) size 129x128
    112                     RenderSVGRect {rect} at (0,0) size 129x128 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=1.00] [y=1.00] [width=38.00] [height=38.00]
     111                  RenderSVGContainer {a} at (0,0) size 128x128
     112                    RenderSVGRect {rect} at (0,0) size 128x128 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=1.00] [y=1.00] [width=38.00] [height=38.00]
    113113                    RenderSVGText {text} at (11,8) size 18x24 contains 1 chunk(s)
    114114                      RenderSVGInlineText {#text} at (0,0) size 18x24
     
    119119                      RenderSVGInlineText {#text} at (0,0) size 15x24
    120120                        chunk 1 (middle anchor) text run 1 at (52.81,27.00) startOffset 0 endOffset 1 width 14.38: "N"
    121                   RenderSVGContainer {a} at (0,128) size 129x128
    122                     RenderSVGRect {rect} at (0,128) size 129x128 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=1.00] [y=41.00] [width=38.00] [height=38.00]
     121                  RenderSVGContainer {a} at (0,128) size 128x128
     122                    RenderSVGRect {rect} at (0,128) size 128x128 [stroke={[type=SOLID] [color=#FFCC33] [stroke width=2.00]}] [fill={[type=LINEAR-GRADIENT] [id="surface"]}] [x=1.00] [y=41.00] [width=38.00] [height=38.00]
    123123                    RenderSVGText {text} at (14,48) size 12x24 contains 1 chunk(s)
    124124                      RenderSVGInlineText {#text} at (0,0) size 12x24
  • trunk/LayoutTests/platform/mac/svg/wicd/test-rightsizing-b-expected.txt

    r161884 r168350  
    3636                RenderSVGContainer {g} at (19,44) size 110x61
    3737                  RenderSVGText {text} at (26,59) size 148x83 contains 1 chunk(s)
    38                     RenderSVGInlineText {#text} at (0,0) size 148x83
    39                       chunk 1 (middle anchor) text run 1 at (26.23,125.00) startOffset 0 endOffset 3 width 147.55: "SVG"
     38                    RenderSVGInlineText {#text} at (0,0) size 148x82
     39                      chunk 1 (middle anchor) text run 1 at (26.44,125.00) startOffset 0 endOffset 3 width 147.13: "SVG"
    4040          RenderText {#text} at (446,281) size 5x17
    4141            text run at (446,281) width 5: " "
     
    5050                RenderSVGContainer {g} at (9,22) size 56x31
    5151                  RenderSVGText {text} at (26,59) size 148x83 contains 1 chunk(s)
    52                     RenderSVGInlineText {#text} at (0,0) size 148x83
    53                       chunk 1 (middle anchor) text run 1 at (26.22,125.00) startOffset 0 endOffset 3 width 147.56: "SVG"
     52                    RenderSVGInlineText {#text} at (0,0) size 148x82
     53                      chunk 1 (middle anchor) text run 1 at (26.44,125.00) startOffset 0 endOffset 3 width 147.13: "SVG"
    5454          RenderText {#text} at (524,281) size 5x17
    5555            text run at (524,281) width 5: " "
     
    6464                RenderSVGContainer {g} at (4,11) size 29x16
    6565                  RenderSVGText {text} at (26,59) size 148x83 contains 1 chunk(s)
    66                     RenderSVGInlineText {#text} at (0,0) size 148x83
    67                       chunk 1 (middle anchor) text run 1 at (26.22,125.00) startOffset 0 endOffset 3 width 147.56: "SVG"
     66                    RenderSVGInlineText {#text} at (0,0) size 148x82
     67                      chunk 1 (middle anchor) text run 1 at (26.44,125.00) startOffset 0 endOffset 3 width 147.13: "SVG"
    6868          RenderText {#text} at (0,0) size 0x0
    6969        RenderBlock {p} at (0,368) size 679x65
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-background-image-tiled-expected.txt

    r161884 r168350  
    33layer at (0,0) size 800x245
    44  RenderBlock {HTML} at (0,0) size 800x245
    5     RenderBody {BODY} at (16,16) size 768x212
    6       RenderBlock {DIV} at (0,0) size 771x212 [border: (2px solid #CCCCCC)]
     5    RenderBody {BODY} at (16,16) size 768x213
     6      RenderBlock {DIV} at (0,0) size 771x212 [border: (2.06px solid #CCCCCC)]
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.txt

    r161884 r168350  
    44  RenderBlock {HTML} at (0,0) size 800x164
    55    RenderBody {BODY} at (4,4) size 792x155
    6       RenderBlock {DIV} at (11,11) size 130x130 [border: (1px solid #000000)]
     6      RenderBlock {DIV} at (11,11) size 131x131 [border: (1.16px solid #000000)]
    77      RenderText {#text} at (152,144) size 3x10
    88        text run at (152,144) width 3: " "
    9       RenderBlock {DIV} at (166,11) size 130x130 [border: (1px solid #000000)]
    10       RenderText {#text} at (306,144) size 3x10
    11         text run at (306,144) width 3: " "
    12       RenderBlock {DIV} at (320,11) size 130x130 [border: (1px solid #000000)]
    13       RenderText {#text} at (461,144) size 3x10
    14         text run at (461,144) width 3: " "
    15       RenderImage {IMG} at (474,11) size 131x130 [border: (1px solid #000000)]
     9      RenderBlock {DIV} at (166,11) size 130x131 [border: (1.16px solid #000000)]
     10      RenderText {#text} at (307,144) size 3x10
     11        text run at (307,144) width 3: " "
     12      RenderBlock {DIV} at (321,11) size 130x131 [border: (1.16px solid #000000)]
     13      RenderText {#text} at (462,144) size 3x10
     14        text run at (462,144) width 3: " "
     15      RenderImage {IMG} at (475,11) size 131x131 [border: (1.16px solid #000000)]
    1616      RenderText {#text} at (0,0) size 0x0
    1717      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt

    r161884 r168350  
    1717    RenderSVGRect {rect} at (0,0) size 361x289 [stroke={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=250.00] [height=200.00]
    1818    RenderSVGForeignObject {foreignObject} at (260,0) size 250x200
    19       RenderSVGRoot {svg} at (260,5) size 250x198
    20         RenderSVGContainer {g} at (260,5) size 250x198 [transform={m=((3.00,0.26)(0.26,3.02)) t=(0.00,0.00)}]
     19      RenderSVGRoot {svg} at (260,5) size 250x145
     20        RenderSVGContainer {g} at (260,5) size 250x145 [transform={m=((3.00,0.26)(0.26,3.02)) t=(0.00,0.00)}]
    2121          RenderSVGText {text} at (0,1) size 82x19 contains 1 chunk(s)
    2222            RenderSVGInlineText {#text} at (0,0) size 82x19
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt

    r161884 r168350  
    2525            RenderTableCell {TH} at (66,33) size 111x0 [bgcolor=#DDDD99] [r=1 c=1 rs=1 cs=1]
    2626            RenderTableCell {TD} at (178,15) size 140x37 [r=1 c=2 rs=1 cs=1]
    27               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     27              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    2828              RenderText {#text} at (0,0) size 0x0
    2929            RenderTableCell {TD} at (319,15) size 140x37 [r=1 c=3 rs=1 cs=1]
     
    4040                text run at (42,0) width 27: "none"
    4141            RenderTableCell {TD} at (178,53) size 140x37 [r=2 c=2 rs=1 cs=1]
    42               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     42              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    4343              RenderText {#text} at (0,0) size 0x0
    4444            RenderTableCell {TD} at (319,53) size 140x37 [r=2 c=3 rs=1 cs=1]
     
    5757                text run at (42,0) width 27: "meet"
    5858            RenderTableCell {TD} at (178,91) size 140x37 [r=3 c=2 rs=1 cs=1]
    59               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     59              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    6060              RenderText {#text} at (0,0) size 0x0
    6161            RenderTableCell {TD} at (319,91) size 140x37 [r=3 c=3 rs=1 cs=1]
     
    7474                text run at (43,0) width 25: "slice"
    7575            RenderTableCell {TD} at (178,129) size 140x37 [r=4 c=2 rs=1 cs=1]
    76               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     76              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    7777              RenderText {#text} at (0,0) size 0x0
    7878            RenderTableCell {TD} at (319,129) size 140x37 [r=4 c=3 rs=1 cs=1]
     
    9292            RenderTableCell {TH} at (66,185) size 111x0 [bgcolor=#DDDD99] [r=5 c=1 rs=1 cs=1]
    9393            RenderTableCell {TD} at (178,167) size 140x37 [r=5 c=2 rs=1 cs=1]
    94               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     94              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    9595              RenderText {#text} at (0,0) size 0x0
    9696            RenderTableCell {TD} at (319,167) size 140x37 [r=5 c=3 rs=1 cs=1]
     
    9999                  RenderView at (0,0) size 133x29
    100100                layer at (0,0) size 133x29
    101                   RenderSVGRoot {svg} at (52,0) size 21x21
     101                  RenderSVGRoot {svg} at (52,0) size 22x22
    102102                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    103                     RenderSVGContainer {g} at (52,0) size 21x21 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
    104                       RenderSVGPath {path} at (52,0) size 21x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
     103                    RenderSVGContainer {g} at (52,0) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
     104                      RenderSVGPath {path} at (52,0) size 22x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
    105105              RenderText {#text} at (0,0) size 0x0
    106106          RenderTableRow {TR} at (0,205) size 460x37
     
    109109                text run at (42,0) width 27: "none"
    110110            RenderTableCell {TD} at (178,205) size 140x37 [r=6 c=2 rs=1 cs=1]
    111               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     111              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    112112              RenderText {#text} at (0,0) size 0x0
    113113            RenderTableCell {TD} at (319,205) size 140x37 [r=6 c=3 rs=1 cs=1]
     
    116116                  RenderView at (0,0) size 133x29
    117117                layer at (0,0) size 133x29
    118                   RenderSVGRoot {svg} at (0,0) size 97x21
     118                  RenderSVGRoot {svg} at (0,0) size 97x22
    119119                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    120                     RenderSVGContainer {g} at (0,0) size 97x21 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
    121                       RenderSVGPath {path} at (0,0) size 97x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
     120                    RenderSVGContainer {g} at (0,0) size 97x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
     121                      RenderSVGPath {path} at (0,0) size 97x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
    122122              RenderText {#text} at (0,0) size 0x0
    123123          RenderTableRow {TR} at (0,243) size 460x37
     
    126126                text run at (42,0) width 27: "meet"
    127127            RenderTableCell {TD} at (178,243) size 140x37 [r=7 c=2 rs=1 cs=1]
    128               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     128              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    129129              RenderText {#text} at (0,0) size 0x0
    130130            RenderTableCell {TD} at (319,243) size 140x37 [r=7 c=3 rs=1 cs=1]
     
    133133                  RenderView at (0,0) size 133x29
    134134                layer at (0,0) size 133x29
    135                   RenderSVGRoot {svg} at (52,0) size 21x21
     135                  RenderSVGRoot {svg} at (52,0) size 22x22
    136136                    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    137                     RenderSVGContainer {g} at (52,0) size 21x21 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
    138                       RenderSVGPath {path} at (52,0) size 21x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
     137                    RenderSVGContainer {g} at (52,0) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
     138                      RenderSVGPath {path} at (52,0) size 22x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
    139139              RenderText {#text} at (0,0) size 0x0
    140140          RenderTableRow {TR} at (0,281) size 460x37
     
    143143                text run at (43,0) width 25: "slice"
    144144            RenderTableCell {TD} at (178,281) size 140x37 [r=8 c=2 rs=1 cs=1]
    145               RenderImage {IMG} at (0,0) size 139x35 [border: (1px dashed #800000)]
     145              RenderImage {IMG} at (0,0) size 139x35 [border: (1.38px dashed #800000)]
    146146              RenderText {#text} at (0,0) size 0x0
    147147            RenderTableCell {TD} at (319,281) size 140x37 [r=8 c=3 rs=1 cs=1]
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-as-relative-image-expected.txt

    r161884 r168350  
    55    RenderBody {BODY} at (0,0) size 800x600
    66      RenderBlock {DIV} at (0,0) size 84x84 [bgcolor=#FF0000]
    7         RenderImage {IMG} at (0,0) size 84x83
     7        RenderImage {IMG} at (0,0) size 84x84
    88        RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.txt

    r161884 r168350  
    1 layer at (0,0) size 785x767
     1layer at (0,0) size 785x769
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x767
    4   RenderBlock {html} at (0,0) size 785x767
    5     RenderBody {body} at (11,11) size 763x733
     3layer at (0,0) size 785x769
     4  RenderBlock {html} at (0,0) size 785x770
     5    RenderBody {body} at (11,11) size 763x736
    66      RenderBlock (anonymous) at (0,0) size 762x52
    77        RenderText {#text} at (0,0) size 758x52
     
    1212        RenderText {#text} at (0,0) size 524x26
    1313          text run at (0,0) width 524: "There should be a red, white and blue pattern below this"
    14       RenderSVGRoot {svg} at (25,149) size 202x202
     14      RenderSVGRoot {svg} at (25,149) size 203x203
    1515        RenderSVGRect {rect} at (53,177) size 146x146 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
    16       RenderBlock {p} at (0,353) size 762x27
     16      RenderBlock {p} at (0,354) size 762x27
    1717        RenderText {#text} at (0,0) size 523x26
    1818          text run at (0,0) width 523: "There should be a red, white and blue pattern above this"
    19       RenderBlock {hr} at (0,402) size 762x3 [border: (1px inset #000000)]
    20       RenderBlock {p} at (0,427) size 762x27
     19      RenderBlock {hr} at (0,403) size 762x4 [border: (1.44px inset #000000)]
     20      RenderBlock {p} at (0,429) size 762x27
    2121        RenderText {#text} at (0,0) size 524x26
    2222          text run at (0,0) width 524: "There should be a red, white and blue pattern below this"
    23       RenderBlock (floating) {div} at (14,491) size 202x201 [border: (14px solid #FF0000)]
     23      RenderBlock (floating) {div} at (14,492) size 202x203 [border: (14.39px solid #FF0000)]
    2424        RenderBlock {div} at (28,28) size 145x145 [bgcolor=#0000FF]
    25       RenderBlock {p} at (0,706) size 762x27
     25      RenderBlock {p} at (0,708) size 762x27
    2626        RenderText {#text} at (0,0) size 523x26
    2727          text run at (0,0) width 523: "There should be a red, white and blue pattern above this"
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt

    r161884 r168350  
    2929                        layer at (0,0) size 139x69
    3030                          RenderSVGRoot {svg} at (23,0) size 93x69
    31                             RenderSVGContainer {g} at (28,8) size 73x47
    32                               RenderSVGRect {rect} at (28,8) size 11x17 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
     31                            RenderSVGContainer {g} at (28,8) size 73x46
     32                              RenderSVGRect {rect} at (29,8) size 10x17 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
    3333                              RenderSVGRect {rect} at (48,8) size 10x17 [fill={[type=SOLID] [color=#FF0000]}] [x=130.00] [y=46.00] [width=50.00] [height=80.00]
    3434                              RenderSVGRect {rect} at (71,8) size 11x17 [stroke={[type=SOLID] [color=#000000]}] [x=250.00] [y=46.00] [width=50.00] [height=80.00]
    3535                              RenderSVGRect {rect} at (90,8) size 11x17 [fill={[type=SOLID] [color=#FF0000]}] [x=350.00] [y=46.00] [width=50.00] [height=80.00]
    36                               RenderSVGRect {rect} at (28,37) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
    37                               RenderSVGRect {rect} at (47,37) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=130.00] [y=196.00] [width=50.00] [height=80.00]
    38                               RenderSVGRect {rect} at (70,37) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
    39                               RenderSVGRect {rect} at (90,37) size 11x17 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
    40                             RenderSVGText {text} at (10,303) size 270x48 contains 1 chunk(s)
    41                               RenderSVGInlineText {#text} at (0,0) size 270x47
    42                                 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 269.59: "$Revision: 1.7 $"
     36                              RenderSVGRect {rect} at (28,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
     37                              RenderSVGRect {rect} at (47,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=130.00] [y=196.00] [width=50.00] [height=80.00]
     38                              RenderSVGRect {rect} at (70,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
     39                              RenderSVGRect {rect} at (90,37) size 11x16 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
     40                            RenderSVGText {text} at (10,303) size 272x48 contains 1 chunk(s)
     41                              RenderSVGInlineText {#text} at (0,0) size 272x47
     42                                chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 271.30: "$Revision: 1.7 $"
    4343                            RenderSVGRect {rect} at (23,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
    4444                      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt

    r161884 r168350  
    2929                        layer at (0,0) size 139x69
    3030                          RenderSVGRoot {svg} at (23,0) size 93x69
    31                             RenderSVGContainer {g} at (28,8) size 73x47
    32                               RenderSVGRect {rect} at (28,8) size 11x17 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
     31                            RenderSVGContainer {g} at (28,8) size 73x46
     32                              RenderSVGRect {rect} at (29,8) size 10x17 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
    3333                              RenderSVGRect {rect} at (48,8) size 10x17 [fill={[type=SOLID] [color=#FF0000]}] [x=130.00] [y=46.00] [width=50.00] [height=80.00]
    3434                              RenderSVGRect {rect} at (71,8) size 11x17 [stroke={[type=SOLID] [color=#000000]}] [x=250.00] [y=46.00] [width=50.00] [height=80.00]
    3535                              RenderSVGRect {rect} at (90,8) size 11x17 [fill={[type=SOLID] [color=#FF0000]}] [x=350.00] [y=46.00] [width=50.00] [height=80.00]
    36                               RenderSVGRect {rect} at (28,37) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
    37                               RenderSVGRect {rect} at (47,37) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=130.00] [y=196.00] [width=50.00] [height=80.00]
    38                               RenderSVGRect {rect} at (70,37) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
    39                               RenderSVGRect {rect} at (90,37) size 11x17 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
    40                             RenderSVGText {text} at (10,303) size 270x48 contains 1 chunk(s)
    41                               RenderSVGInlineText {#text} at (0,0) size 270x47
    42                                 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 269.59: "$Revision: 1.7 $"
     36                              RenderSVGRect {rect} at (28,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
     37                              RenderSVGRect {rect} at (47,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=130.00] [y=196.00] [width=50.00] [height=80.00]
     38                              RenderSVGRect {rect} at (70,36) size 12x18 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
     39                              RenderSVGRect {rect} at (90,37) size 11x16 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
     40                            RenderSVGText {text} at (10,303) size 272x48 contains 1 chunk(s)
     41                              RenderSVGInlineText {#text} at (0,0) size 272x47
     42                                chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 271.30: "$Revision: 1.7 $"
    4343                            RenderSVGRect {rect} at (23,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
    4444                      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.txt

    r161884 r168350  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x172
    4   RenderBlock {HTML} at (0,0) size 800x173
    5     RenderBody {BODY} at (5,5) size 790x162
    6       RenderEmbeddedObject {OBJECT} at (0,0) size 159x159 [border: (1px dashed #800000)]
     3layer at (0,0) size 800x173
     4  RenderBlock {HTML} at (0,0) size 800x174
     5    RenderBody {BODY} at (5,5) size 790x163
     6      RenderEmbeddedObject {OBJECT} at (0,0) size 160x160 [border: (1.38px dashed #800000)]
    77        layer at (0,0) size 153x153
    88          RenderView at (0,0) size 153x153
     
    1010          RenderSVGRoot {svg} at (0,0) size 153x153
    1111            RenderSVGEllipse {circle} at (0,0) size 153x153 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00]
    12       RenderText {#text} at (158,148) size 4x13
    13         text run at (158,148) width 4: " "
    14       RenderEmbeddedObject {OBJECT} at (161,0) size 160x159 [border: (1px dashed #800000)]
     12      RenderText {#text} at (159,149) size 4x13
     13        text run at (159,149) width 4: " "
     14      RenderEmbeddedObject {OBJECT} at (162,0) size 161x160 [border: (1.38px dashed #800000)]
    1515        layer at (0,0) size 153x153
    1616          RenderView at (0,0) size 153x153
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.txt

    r161884 r168350  
    2020                RenderSVGPath {path} at (134,62) size 16x23 [fill={[type=SOLID] [color=#000000] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 41.928 22.542 C 42.682 22.542 43.616 23.048 44.057 23.703 C 44.532 24.376 44.876 25.326 44.876 26.39 C 44.876 27.979 44.712 29.731 43.762 30.272 C 43.468 30.451 42.829 30.6 42.452 30.6 C 41.601 30.6 41.536 30.059 40.732 29.241 C 40.471 28.946 39.653 27.505 39.653 26.311 C 39.653 25.574 39.472 24.507 40.127 23.559 C 40.571 22.868 41.143 22.542 41.928 22.542 Z"]
    2121                RenderSVGPath {path} at (140,65) size 8x13 [fill={[type=SOLID] [color=#999999] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 43.616 24.556 C 43.188 23.639 42.026 23.425 41.733 23.867 C 41.438 24.325 41.815 24.766 42.47 25.717 C 43.14 26.732 42.895 27.846 43.665 27.601 C 43.958 27.502 44.026 25.488 43.616 24.556 Z"]
    22                 RenderSVGPath {path} at (177,62) size 19x24 [fill={[type=SOLID] [color=#000000] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 58.37 22.443 C 60.238 22.443 61.319 24.112 61.695 26.241 C 61.841 27.208 61.615 28.321 61.023 29.09 C 60.353 29.976 59.158 30.532 58.191 30.532 C 57.273 30.532 56.242 30.68 55.7 29.927 C 55.145 29.156 55.03 27.453 55.03 26.241 C 55.03 24.883 55.424 23.916 56.109 23.145 C 56.636 22.573 57.585 22.443 58.37 22.443 Z"]
     22                RenderSVGPath {path} at (177,62) size 19x23 [fill={[type=SOLID] [color=#000000] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 58.37 22.443 C 60.238 22.443 61.319 24.112 61.695 26.241 C 61.841 27.208 61.615 28.321 61.023 29.09 C 60.353 29.976 59.158 30.532 58.191 30.532 C 57.273 30.532 56.242 30.68 55.7 29.927 C 55.145 29.156 55.03 27.453 55.03 26.241 C 55.03 24.883 55.424 23.916 56.109 23.145 C 56.636 22.573 57.585 22.443 58.37 22.443 Z"]
    2323                RenderSVGPath {path} at (184,63) size 10x10 [fill={[type=SOLID] [color=#999999] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 60.042 23.949 C 59.384 23.212 58.83 22.982 58.485 23.212 C 57.813 23.654 58.355 24.032 58.959 24.702 C 59.353 25.128 59.55 26.128 60.206 25.799 C 61.041 25.34 60.746 24.734 60.042 23.949 Z"]
    24                 RenderSVGPath {path} at (94,98) size 148x220 [fill={[type=SOLID] [color=#FFFFFF] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 78.171 82.167 C 78.171 77.009 77.58 71.753 76.387 67.902 C 75.305 64.284 73.569 61.763 72.078 58.488 C 69.099 51.967 69.246 49.036 66.606 44.877 C 63.579 40.062 65.068 36.868 61.056 37.065 C 56.045 37.344 52.016 44.206 47.283 44.403 C 44.057 44.534 38.965 35.508 38.834 39.243 C 38.735 42.421 38.899 42.371 38.899 45.45 C 38.899 47.497 37.965 47.644 35.934 50.756 C 34.885 52.378 34.066 54.146 33.428 55.932 C 33.035 56.996 32.658 58.109 32.364 59.207 C 32.233 59.746 32.02 60.32 31.888 60.861 C 30.873 64.611 27.255 69.212 26.418 72.946 C 25.568 76.663 24.585 79.04 24.7 84.016 C 24.831 88.995 24.88 87.571 26.386 88.797 C 27.876 90.041 29.415 91.205 31.775 93.285 C 34.248 95.447 39.404 99.213 40.095 100.377 C 40.848 101.572 40.814 104.242 40.373 105.107 C 39.93 105.959 36.031 106.42 36.048 106.42 C 36.031 106.42 39.455 111.135 40.126 111.805 C 40.765 112.446 43.532 115.541 54.832 113.444 C 57.831 112.881 60.509 111.794 62.876 110.442 C 62.925 110.415 62.974 110.389 63.022 110.362 C 63.109 110.315 63.196 110.27 63.278 110.223 C 63.502 110.108 63.721 109.989 63.936 109.868 C 63.969 109.847 64.004 109.831 64.039 109.813 C 65.407 109.059 66.574 108.208 67.43 107.272 C 68.241 106.602 68.999 105.917 69.704 105.241 C 74.307 100.753 71.979 99.46 72.569 97.2 C 73.437 93.958 76.269 92.745 76.909 89.077 C 76.991 88.554 77.155 88.159 77.63 87.389 C 78.351 86.296 78.171 84.149 78.171 82.167 Z"]
     24                RenderSVGPath {path} at (93,98) size 148x219 [fill={[type=SOLID] [color=#FFFFFF] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 78.171 82.167 C 78.171 77.009 77.58 71.753 76.387 67.902 C 75.305 64.284 73.569 61.763 72.078 58.488 C 69.099 51.967 69.246 49.036 66.606 44.877 C 63.579 40.062 65.068 36.868 61.056 37.065 C 56.045 37.344 52.016 44.206 47.283 44.403 C 44.057 44.534 38.965 35.508 38.834 39.243 C 38.735 42.421 38.899 42.371 38.899 45.45 C 38.899 47.497 37.965 47.644 35.934 50.756 C 34.885 52.378 34.066 54.146 33.428 55.932 C 33.035 56.996 32.658 58.109 32.364 59.207 C 32.233 59.746 32.02 60.32 31.888 60.861 C 30.873 64.611 27.255 69.212 26.418 72.946 C 25.568 76.663 24.585 79.04 24.7 84.016 C 24.831 88.995 24.88 87.571 26.386 88.797 C 27.876 90.041 29.415 91.205 31.775 93.285 C 34.248 95.447 39.404 99.213 40.095 100.377 C 40.848 101.572 40.814 104.242 40.373 105.107 C 39.93 105.959 36.031 106.42 36.048 106.42 C 36.031 106.42 39.455 111.135 40.126 111.805 C 40.765 112.446 43.532 115.541 54.832 113.444 C 57.831 112.881 60.509 111.794 62.876 110.442 C 62.925 110.415 62.974 110.389 63.022 110.362 C 63.109 110.315 63.196 110.27 63.278 110.223 C 63.502 110.108 63.721 109.989 63.936 109.868 C 63.969 109.847 64.004 109.831 64.039 109.813 C 65.407 109.059 66.574 108.208 67.43 107.272 C 68.241 106.602 68.999 105.917 69.704 105.241 C 74.307 100.753 71.979 99.46 72.569 97.2 C 73.437 93.958 76.269 92.745 76.909 89.077 C 76.991 88.554 77.155 88.159 77.63 87.389 C 78.351 86.296 78.171 84.149 78.171 82.167 Z"]
    2525                RenderSVGResourceLinearGradient {linearGradient} [id="XMLID_2_"] [gradientUnits=userSpaceOnUse] [start=(54.99,39.65)] [end=(41.91,26.22)]
    2626                  RenderSVGGradientStop {stop} [offset=0.00] [color=#FFA700]
    2727                  RenderSVGGradientStop {stop} [offset=0.69] [color=#FFFF00]
    28                 RenderSVGPath {path} at (130,75) size 74x51 [fill={[type=LINEAR-GRADIENT] [id="XMLID_2_"]}] [data="M 57.177 30.008 C 56.209 29.681 55.474 29.255 54.408 28.468 C 53.278 27.635 50.804 27.174 48.986 27.404 C 47.71 27.552 46.908 27.422 45.678 28.044 C 44.336 28.749 42.404 30.304 41.34 31.238 C 39.308 33.005 37.868 33.727 37.933 35.937 C 37.982 38.016 39.702 39.607 41.537 41.08 C 43.37 42.604 44.926 44.486 46.04 44.879 C 47.202 45.305 49.217 45.224 50.659 45.224 C 53.869 45.224 58.027 41.179 60.354 40.474 C 63.25 39.558 64.267 37.984 64.496 34.497 C 64.692 31.565 60.434 31.072 57.177 30.008 Z"]
     28                RenderSVGPath {path} at (130,75) size 74x50 [fill={[type=LINEAR-GRADIENT] [id="XMLID_2_"]}] [data="M 57.177 30.008 C 56.209 29.681 55.474 29.255 54.408 28.468 C 53.278 27.635 50.804 27.174 48.986 27.404 C 47.71 27.552 46.908 27.422 45.678 28.044 C 44.336 28.749 42.404 30.304 41.34 31.238 C 39.308 33.005 37.868 33.727 37.933 35.937 C 37.982 38.016 39.702 39.607 41.537 41.08 C 43.37 42.604 44.926 44.486 46.04 44.879 C 47.202 45.305 49.217 45.224 50.659 45.224 C 53.869 45.224 58.027 41.179 60.354 40.474 C 63.25 39.558 64.267 37.984 64.496 34.497 C 64.692 31.565 60.434 31.072 57.177 30.008 Z"]
    2929                RenderSVGResourceLinearGradient {linearGradient} [id="XMLID_3_"] [gradientUnits=userSpaceOnUse] [start=(89.48,113.08)] [end=(65.41,88.33)]
    3030                  RenderSVGGradientStop {stop} [offset=0.00] [color=#FFA700]
     
    3434                  RenderSVGGradientStop {stop} [offset=0.00] [color=#FFA700]
    3535                  RenderSVGGradientStop {stop} [offset=0.69] [color=#FFFF00]
    36                 RenderSVGPath {path} at (25,235) size 117x112 [fill={[type=LINEAR-GRADIENT] [id="XMLID_4_"]}] [data="M 41.699 117.28 C 41.635 112.628 38.637 111.235 35.23 105.866 C 31.841 100.475 31.301 99.495 29.041 95.925 C 26.781 92.402 22.327 85.999 19.772 85.935 C 17.742 85.886 16.595 86.966 15.334 88.259 C 15.274 88.322 15.214 88.388 15.154 88.46 C 13.924 89.86 12.412 92.89 10.273 94.437 C 8.046 96.041 2.396 95.892 0.955 97.775 C -0.452 99.658 1.005 102.394 0.989 107.437 C 0.989 109.599 0.611 111.236 0.367 112.548 C 0.343 112.657 0.318 112.763 0.295 112.868 C 0.29 112.882 0.289 112.897 0.284 112.913 C 0.16 113.386 0.064 113.788 0.002 114.142 C -0.099 114.697 -0.103 115.124 0.023 115.513 C 0.05 115.597 0.082 115.683 0.119 115.765 C 0.147 115.833 0.179 115.902 0.213 115.97 C 0.217 115.98 0.22 115.991 0.227 116.001 L 0.228 116.007 C 0.294 116.187 0.376 116.364 0.482 116.544 C 0.538 116.636 0.595 116.724 0.657 116.808 C 1.939 118.718 4.261 119.292 15.417 121.619 C 21.641 122.914 27.502 126.256 31.45 126.582 C 35.396 126.877 36.232 125.566 38.64 123.437 C 41.011 121.292 41.781 121.962 41.699 117.28 Z"]
    37                 RenderSVGContainer {g} at (240,232) size 43x20
    38                   RenderSVGPath {path} at (240,232) size 19x13 [fill={[type=SOLID] [color=#4D4D4D] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 82.495 85.034 C 81.004 85.229 80.005 85.999 79.415 86.704 C 78.842 87.358 78.202 88.311 78.498 88.604 C 78.772 88.879 79.025 88.653 79.279 88.317 C 79.302 88.29 79.324 88.26 79.348 88.231 C 79.438 88.131 79.526 88.012 79.615 87.887 C 79.638 87.86 79.663 87.83 79.685 87.799 C 79.728 87.748 79.771 87.695 79.816 87.639 C 79.842 87.61 79.865 87.578 79.891 87.545 C 79.931 87.502 79.969 87.455 80.01 87.404 C 80.536 86.97 81.37 86.082 83.033 86.082 C 84.721 86.082 84.59 86.031 84.524 85.377 C 84.475 84.772 83.969 84.821 82.495 85.034 Z"]
    39                   RenderSVGPath {path} at (259,233) size 24x19 [fill={[type=SOLID] [color=#4D4D4D] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 90.503 85.853 C 89.061 85.314 88.014 85.066 86.751 85.017 C 85.064 84.935 85.213 85.361 85.213 85.361 C 85.213 86.148 86.834 86.429 88.358 86.656 C 89.881 86.867 91.091 87.164 91.157 88.752 C 91.241 90.326 90.848 91.438 91.536 91.309 C 93.023 91.028 93.565 89.424 93.549 88.688 C 93.548 87.933 92.451 86.608 90.503 85.853 Z"]
     36                RenderSVGPath {path} at (25,235) size 116x112 [fill={[type=LINEAR-GRADIENT] [id="XMLID_4_"]}] [data="M 41.699 117.28 C 41.635 112.628 38.637 111.235 35.23 105.866 C 31.841 100.475 31.301 99.495 29.041 95.925 C 26.781 92.402 22.327 85.999 19.772 85.935 C 17.742 85.886 16.595 86.966 15.334 88.259 C 15.274 88.322 15.214 88.388 15.154 88.46 C 13.924 89.86 12.412 92.89 10.273 94.437 C 8.046 96.041 2.396 95.892 0.955 97.775 C -0.452 99.658 1.005 102.394 0.989 107.437 C 0.989 109.599 0.611 111.236 0.367 112.548 C 0.343 112.657 0.318 112.763 0.295 112.868 C 0.29 112.882 0.289 112.897 0.284 112.913 C 0.16 113.386 0.064 113.788 0.002 114.142 C -0.099 114.697 -0.103 115.124 0.023 115.513 C 0.05 115.597 0.082 115.683 0.119 115.765 C 0.147 115.833 0.179 115.902 0.213 115.97 C 0.217 115.98 0.22 115.991 0.227 116.001 L 0.228 116.007 C 0.294 116.187 0.376 116.364 0.482 116.544 C 0.538 116.636 0.595 116.724 0.657 116.808 C 1.939 118.718 4.261 119.292 15.417 121.619 C 21.641 122.914 27.502 126.256 31.45 126.582 C 35.396 126.877 36.232 125.566 38.64 123.437 C 41.011 121.292 41.781 121.962 41.699 117.28 Z"]
     37                RenderSVGContainer {g} at (240,232) size 43x19
     38                  RenderSVGPath {path} at (240,232) size 19x12 [fill={[type=SOLID] [color=#4D4D4D] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 82.495 85.034 C 81.004 85.229 80.005 85.999 79.415 86.704 C 78.842 87.358 78.202 88.311 78.498 88.604 C 78.772 88.879 79.025 88.653 79.279 88.317 C 79.302 88.29 79.324 88.26 79.348 88.231 C 79.438 88.131 79.526 88.012 79.615 87.887 C 79.638 87.86 79.663 87.83 79.685 87.799 C 79.728 87.748 79.771 87.695 79.816 87.639 C 79.842 87.61 79.865 87.578 79.891 87.545 C 79.931 87.502 79.969 87.455 80.01 87.404 C 80.536 86.97 81.37 86.082 83.033 86.082 C 84.721 86.082 84.59 86.031 84.524 85.377 C 84.475 84.772 83.969 84.821 82.495 85.034 Z"]
     39                  RenderSVGPath {path} at (259,233) size 24x18 [fill={[type=SOLID] [color=#4D4D4D] [fill rule=EVEN-ODD]}] [clip rule=EVEN-ODD] [data="M 90.503 85.853 C 89.061 85.314 88.014 85.066 86.751 85.017 C 85.064 84.935 85.213 85.361 85.213 85.361 C 85.213 86.148 86.834 86.429 88.358 86.656 C 89.881 86.867 91.091 87.164 91.157 88.752 C 91.241 90.326 90.848 91.438 91.536 91.309 C 93.023 91.028 93.565 89.424 93.549 88.688 C 93.548 87.933 92.451 86.608 90.503 85.853 Z"]
    4040      RenderText {#text} at (349,339) size 4x13
    4141        text run at (349,339) width 4: " "
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt

    r161884 r168350  
    3131                            RenderSVGContainer {g} at (18,31) size 260x164
    3232                              RenderSVGRect {rect} at (20,31) size 36x57 [stroke={[type=SOLID] [color=#000000]}] [x=30.00] [y=46.00] [width=50.00] [height=80.00]
    33                               RenderSVGRect {rect} at (90,31) size 35x57 [fill={[type=SOLID] [color=#FF0000]}] [x=130.00] [y=46.00] [width=50.00] [height=80.00]
     33                              RenderSVGRect {rect} at (90,32) size 35x56 [fill={[type=SOLID] [color=#FF0000]}] [x=130.00] [y=46.00] [width=50.00] [height=80.00]
    3434                              RenderSVGRect {rect} at (173,31) size 36x57 [stroke={[type=SOLID] [color=#000000]}] [x=250.00] [y=46.00] [width=50.00] [height=80.00]
    35                               RenderSVGRect {rect} at (243,31) size 35x57 [fill={[type=SOLID] [color=#FF0000]}] [x=350.00] [y=46.00] [width=50.00] [height=80.00]
     35                              RenderSVGRect {rect} at (242,32) size 36x56 [fill={[type=SOLID] [color=#FF0000]}] [x=350.00] [y=46.00] [width=50.00] [height=80.00]
    3636                              RenderSVGRect {rect} at (18,133) size 41x62 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=30.00] [y=196.00] [width=50.00] [height=80.00]
    3737                              RenderSVGRect {rect} at (87,133) size 41x62 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=130.00] [y=196.00] [width=50.00] [height=80.00]
    38                               RenderSVGRect {rect} at (170,133) size 42x62 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
    39                               RenderSVGRect {rect} at (243,136) size 35x56 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
     38                              RenderSVGRect {rect} at (170,133) size 41x62 [stroke={[type=SOLID] [color=#0000FF] [stroke width=8.00]}] [x=250.00] [y=196.00] [width=50.00] [height=80.00]
     39                              RenderSVGRect {rect} at (242,136) size 36x56 [fill={[type=SOLID] [color=#00FF00]}] [x=350.00] [y=196.00] [width=50.00] [height=80.00]
    4040                            RenderSVGText {text} at (10,303) size 267x48 contains 1 chunk(s)
    4141                              RenderSVGInlineText {#text} at (0,0) size 267x47
    42                                 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 266.42: "$Revision: 1.7 $"
     42                                chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 266.67: "$Revision: 1.7 $"
    4343                            RenderSVGRect {rect} at (0,0) size 333x250 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
    4444                      RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-zoom-coords-expected.txt

    r149210 r168350  
    5454PASS image1.bottom.toFixed(2) is "275.00"
    5555PASS text1.left.toFixed(2) is "100.00"
    56 FAIL text1.top.toFixed(2) should be 282.66. Was 282.50.
    57 FAIL text1.width.toFixed(2) should be 49.20. Was 50.00.
    58 FAIL text1.height.toFixed(2) should be 6.16. Was 6.50.
    59 FAIL text1.right.toFixed(2) should be 149.20. Was 150.00.
    60 FAIL text1.bottom.toFixed(2) should be 288.82. Was 289.00.
     56FAIL text1.top.toFixed(2) should be 282.66. Was 282.58.
     57PASS text1.width.toFixed(2) is "49.20"
     58PASS text1.height.toFixed(2) is "6.16"
     59PASS text1.right.toFixed(2) is "149.20"
     60FAIL text1.bottom.toFixed(2) should be 288.82. Was 288.73.
    6161
    6262PASS svg2.left.toFixed(2) is "75.00"
     
    7979PASS image2.bottom.toFixed(2) is "125.00"
    8080PASS text2.left.toFixed(2) is "175.00"
    81 FAIL text2.top.toFixed(2) should be 132.66. Was 132.50.
    82 FAIL text2.width.toFixed(2) should be 47.44. Was 48.00.
    83 FAIL text2.height.toFixed(2) should be 5.94. Was 6.50.
    84 FAIL text2.right.toFixed(2) should be 222.44. Was 223.00.
    85 FAIL text2.bottom.toFixed(2) should be 138.60. Was 139.00.
     81FAIL text2.top.toFixed(2) should be 132.66. Was 132.75.
     82PASS text2.width.toFixed(2) is "47.44"
     83PASS text2.height.toFixed(2) is "5.94"
     84PASS text2.right.toFixed(2) is "222.44"
     85FAIL text2.bottom.toFixed(2) should be 138.60. Was 138.69.
    8686
    8787PASS svg3.left.toFixed(2) is "900.00"
     
    104104PASS image3.bottom.toFixed(2) is "550.00"
    105105PASS text3.left.toFixed(2) is "1100.00"
    106 FAIL text3.top.toFixed(2) should be 565.33. Was 565.00.
    107 FAIL text3.width.toFixed(2) should be 98.41. Was 100.00.
    108 FAIL text3.height.toFixed(2) should be 12.31. Was 13.00.
    109 FAIL text3.right.toFixed(2) should be 1198.41. Was 1200.00.
    110 FAIL text3.bottom.toFixed(2) should be 577.64. Was 578.00.
     106FAIL text3.top.toFixed(2) should be 565.33. Was 565.16.
     107PASS text3.width.toFixed(2) is "98.41"
     108PASS text3.height.toFixed(2) is "12.31"
     109PASS text3.right.toFixed(2) is "1198.41"
     110FAIL text3.bottom.toFixed(2) should be 577.64. Was 577.47.
    111111
    112112PASS successfullyParsed is true
  • trunk/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt

    r161884 r168350  
    1717    RenderSVGRect {rect} at (0,0) size 251x201 [stroke={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=250.00] [height=200.00]
    1818    RenderSVGForeignObject {foreignObject} at (260,0) size 250x200
    19       RenderSVGRoot {svg} at (260,5) size 250x198
    20         RenderSVGContainer {g} at (260,5) size 250x198 [transform={m=((3.00,0.26)(0.26,3.02)) t=(0.00,0.00)}]
     19      RenderSVGRoot {svg} at (260,5) size 250x195
     20        RenderSVGContainer {g} at (260,5) size 250x195 [transform={m=((3.00,0.26)(0.26,3.02)) t=(0.00,0.00)}]
    2121          RenderSVGText {text} at (0,1) size 82x19 contains 1 chunk(s)
    2222            RenderSVGInlineText {#text} at (0,0) size 82x19
  • trunk/LayoutTests/svg/animations/animate-css-xml-attributeType-expected.txt

    r130777 r168350  
    1212PASS getComputedStyle(rect).getPropertyCSSValue('opacity').getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 0.8
    1313PASS rect.x.animVal.value is 100
    14 PASS getComputedStyle(rect).getPropertyCSSValue('opacity').getFloatValue(CSSPrimitiveValue.CSS_NUMBER) is 1.0
     14FAIL getComputedStyle(rect).getPropertyCSSValue('opacity').getFloatValue(CSSPrimitiveValue.CSS_NUMBER) should be close to 1. Was 0.800000011920929.
    1515PASS rect.x.animVal.value is 200
    1616PASS rect.x.baseVal.value is 100
  • trunk/LayoutTests/svg/as-image/image-respects-deviceScaleFactor.html

    r124380 r168350  
    1313</head>
    1414<p>This test passes if both of the circles have sharp edges when deviceScaleFactor=2.</p>
    15 <img style="width: 128px;" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4Ij4KPGNpcmNsZSBmaWxsPSJibGFjayIgY3g9IjY0IiBjeT0iNjQiIHI9IjY0IiAvPgo8L3N2Zz4K">
    16 <img style="width: 128px;" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgoJPGNpcmNsZSBmaWxsPSJibGFjayIgY3g9IjY0IiBjeT0iNjQiIHI9IjY0IiAvPgo8L3N2Zz4=">
     15<img style="width: 128px;" src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='128' height='128'><circle fill='black' cx='64' cy='64' r='64' /></svg>">
     16<img style="width: 128px;" src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 128 128'><circle fill='black' cx='64' cy='64' r='64' /></svg>">
    1717</html>
  • trunk/LayoutTests/svg/as-image/image-respects-pageScaleFactor.html

    r136055 r168350  
    1313<p>This test passes if both of the circles have sharp edges.</p>
    1414<p>To run manually, use full-page zoom to increase the page scale factor.</p>
    15 <img style="width: 128px;" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4Ij4KPGNpcmNsZSBmaWxsPSJibGFjayIgY3g9IjY0IiBjeT0iNjQiIHI9IjY0IiAvPgo8L3N2Zz4K">
    16 <img style="width: 128px;" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgoJPGNpcmNsZSBmaWxsPSJibGFjayIgY3g9IjY0IiBjeT0iNjQiIHI9IjY0IiAvPgo8L3N2Zz4=">
     15<img style="width: 128px;" src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='128' height='128'><circle fill='black' cx='64' cy='64' r='64'/></svg>">
     16<img style="width: 128px;" src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 128 128'><circle fill='black' cx='64' cy='64' r='64'/></svg>">
    1717
    1818</html>
  • trunk/LayoutTests/svg/as-image/svg-as-image-with-relative-size-expected.html

    r114290 r168350  
    88  <body>
    99    <div style="width: 400px; height: 400px; border: 1px solid black;">
    10         <svg xmlns="http://www.w3.org/2000/svg">
     10        <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
    1111            <rect x="40" y="40" width="120" height="120" fill="green"/>
    1212        </svg>
  • trunk/LayoutTests/svg/as-image/svg-as-relative-image.html

    r87782 r168350  
    1111<body style='margin: 0px'>
    1212<div>
    13   <img src='resources/green-relative-size-rect.svg'>
     13  <img style='width: 100%; height: 100%' src='resources/green-relative-size-rect.svg'>
    1414</div>
    1515</body>
  • trunk/LayoutTests/svg/css/composite-shadow-example.html

    r53157 r168350  
    4343
    4444    var svgContainer = newSvgElement('svg', document.body);
     45    svgContainer.setAttribute('width', '100%');
     46    svgContainer.setAttribute('height', '100%');
    4547    var shapes = [
    4648        { pos: [ 100, 100 ], size: 60, hasStroke: false },
  • trunk/LayoutTests/svg/css/composite-shadow-with-opacity.html

    r53157 r168350  
    4343
    4444    var svgContainer = newSvgElement('svg', document.body);
     45    svgContainer.setAttribute('width', '100%');
     46    svgContainer.setAttribute('height', '100%');
    4547    var shapes = [
    4648        { pos: [ 100, 100 ], size: 60, hasStroke: false },
  • trunk/LayoutTests/svg/css/max-width-2.html

    r123785 r168350  
    11<!DOCTYPE html>
    22<div style="outline: dashed lightblue; height: 300px; width: 400px;">
    3     <svg style="background-color: yellow; max-width: 100%; max-height: 100%;" width="100%" height="100%" viewBox="0 0 900 300">
     3    <svg style="background-color: yellow; max-width: 100%; max-height: 100%;" width="100%" viewBox="0 0 900 300">
    44        <rect x="0" y="0" width="900" height="300" />
    55    </svg>
  • trunk/LayoutTests/svg/css/stars-with-shadow.html

    r53157 r168350  
    4141
    4242    var svgContainer = newSvgElement('svg', document.body);
     43    svgContainer.setAttribute('width', '100%');
     44    svgContainer.setAttribute('height', '100%');
    4345    var shapes = [
    4446        { pos: [ 100, 100 ], size: 60 },
  • trunk/LayoutTests/svg/custom/absolute-sized-content-with-resources.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should contain four masked circles, that do not pixelate after resizing</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="20 15 60 50">
     8        <svg xmlns="http://www.w3.org/2000/svg" viewBox="20 15 60 50" height="100%" width="100%">
    99        <defs>
    1010            <linearGradient id="gradient" x1="0" x2="1" y1="0" y2="1" color-interpolation="linearRGB">
  • trunk/LayoutTests/svg/custom/altglyph.svg

    r68976 r168350  
    66
    77<div style="width: 800px; height: 200px;">
    8 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99<font>
    1010<font-face font-family="xyzzy" units-per-em="100" ascent="100" descent="500">
  • trunk/LayoutTests/svg/custom/document-all-includes-svg-expected.txt

    r154441 r168350  
    77PASS document.all['test4'].length is 2
    88PASS document.all['test5'].length is 2
    9 
     9 
     10 
  • trunk/LayoutTests/svg/custom/external-paintserver-reference-expected.txt

    r103407 r168350  
    1 layer at (0,0) size 785x604
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x604
    4   RenderBlock {html} at (0,0) size 785x604
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x600
     4  RenderBlock {html} at (0,0) size 800x600
    55    RenderSVGRoot {svg} at (0,0) size 100x100
    66      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
     
    99          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
    1010      RenderSVGRect {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
    11     RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/svg/custom/external-paintserver-reference.svg

    r92047 r168350  
    11<?xml version="1.0" standalone="no"?>
    2 <html xmlns="http://www.w3.org/1999/xhtml">
     2<html xmlns="http://www.w3.org/1999/xhtml" style="height:100%">
    33  <!-- There should be no red on the page -->
    4   <svg width="100%" height="100%" version="1.1"
     4  <svg width="100%" height="100%" version="1.1" style="display: block"
    55       xmlns="http://www.w3.org/2000/svg">
    66
  • trunk/LayoutTests/svg/custom/get-text-element-transform-crash-expected.txt

    r112394 r168350  
    1 PASS
     1 PASS
  • trunk/LayoutTests/svg/custom/linking-base-external-reference-expected.txt

    r103407 r168350  
    1 layer at (0,0) size 785x604
    2   RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x604
    4   RenderBlock {html} at (0,0) size 785x604
     1layer at (0,0) size 800x600
     2  RenderView at (0,0) size 800x600
     3layer at (0,0) size 800x154
     4  RenderBlock {html} at (0,0) size 800x154
    55    RenderInline {base} at (0,0) size 0x0
    66    RenderText {#text} at (0,0) size 0x0
  • trunk/LayoutTests/svg/custom/linking-base-external-reference.xhtml

    r92047 r168350  
    44  <!-- There should be no red -->
    55  <svg width="100%" height="100%" version="1.1"
    6        xmlns="http://www.w3.org/2000/svg">
     6       xmlns="http://www.w3.org/2000/svg" style="height: 100%">
    77
    88    <defs>
  • trunk/LayoutTests/svg/custom/pending-resource-after-removal.xhtml

    r124380 r168350  
    5656</script>
    5757<body onload="runRepaintTest()">
    58 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px">
     58<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%">
    5959<defs id="defs"></defs>
    6060<rect id="shape" width="200" height="200"></rect>
  • trunk/LayoutTests/svg/custom/percentage-of-html-parent.xhtml

    r26403 r168350  
    77<p>Below there is a div with an embedded green svg in it. Since the dimensions of the svg are 100%/100% of the parent, the green should cover the red(Bug 9752).</p>
    88    <div style="width: 200px; height: 200px;background:red;">
    9         <svg xmlns="http://www.w3.org/2000/svg">
     9        <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
    1010            <rect fill="green" height="100%" width="100%"/>
    1111        </svg>
  • trunk/LayoutTests/svg/custom/relative-sized-content-with-resources.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area with a circle, which contains a radial gradient in its center</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <defs>
    1010                <radialGradient id="grad" cx="50%" cy="50%" r="40%" gradientUnits="userSpaceOnUse">
  • trunk/LayoutTests/svg/custom/relative-sized-content.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area (blue rectangle), especially after resizing the content box to a different size</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg">
     8        <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
    99            <rect id="targetRect" width="100%" height="100%" fill="blue"/>
    1010        </svg>
  • trunk/LayoutTests/svg/custom/relative-sized-deep-shadow-tree-content.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should contain one blue rectangle from (50%,50%)-(100%,100%), especially after resizing the content box to a different size</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <defs>
    1010                <rect id="targetRect" y="25%" width="50%" height="50%" fill="blue"/>
  • trunk/LayoutTests/svg/custom/relative-sized-image.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area (blue rectangle), especially after resizing the content box to a different size</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <image xlink:href="../W3C-SVG-1.1/resources/smiley.png" width="100%" height="100%" preserveAspectRatio="none"/>
    1010        </svg>
  • trunk/LayoutTests/svg/custom/relative-sized-inner-svg.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area with a green shaped path</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <svg viewBox="0 0 150 150" >
    1010                <path fill="green" d="M143 103 143 117 a27,10 0 1 1 -136 0 L 7 117 7 103 a27,10 0 0 1 136 0 L52 72 a33,33 0 1 1 5 0" />
  • trunk/LayoutTests/svg/custom/relative-sized-shadow-tree-content-with-symbol.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area (two green rectangles, first: (0,0)-(50%,50%), second: (50%,50%)-(100%,100%)), especially after resizing the content box to a different size</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <defs>
    1010                <symbol id="targetSymbol" viewBox="0 0 200 200" width="50%" height="50%">
  • trunk/LayoutTests/svg/custom/relative-sized-shadow-tree-content.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area (two blue rectangles, first: (0,0)-(50%,50%), second: (50%,50%)-(100%,100%)), especially after resizing the content box to a different size</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <defs>
    1010                <rect id="targetRect" y="50%" width="50%" height="50%" fill="blue"/>
  • trunk/LayoutTests/svg/custom/relative-sized-use-on-symbol.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area with a green shaped path</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <defs>
    1010                <symbol id="gamesBorder" viewBox="0 0 150 150" >
  • trunk/LayoutTests/svg/custom/relative-sized-use-without-attributes-on-symbol.xhtml

    r107207 r168350  
    66    <p>The svg area contained in the div element (red box), should fill out the whole area with a green shaped path</p>
    77    <div id="contentBox" style="width: 100px; height: 400px; border: 1px solid red;">
    8         <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     8        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%">
    99            <defs>
    1010                <symbol id="gamesBorder" viewBox="0 0 150 150" >
  • trunk/LayoutTests/svg/custom/tref-with-progress-tag-setpseudo-assert-expected.txt

    r154099 r168350  
    1 PASS
     1PASS  
  • trunk/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt

    r166420 r168350  
     1 
    12Test Passes if there is no crash in Debug or Asan builds. There should be no characters preceding "Test".
  • trunk/LayoutTests/svg/custom/use-invalid-html-expected.txt

    r63867 r168350  
    44Below is a rendering of the page up to the first error.
    55
    6 This test passes if a malformed html document triggers an error, not crash.
     6This test passes if a malformed html document triggers an error, not crash. 
  • trunk/LayoutTests/svg/custom/window-named-item-lookup-expected.txt

    r154441 r168350  
    77PASS window.test4.length is 2
    88PASS window.test5.length is 2
    9 
     9 
     10 
  • trunk/LayoutTests/svg/dom/SVGViewSpec-invalid-ref-crash-expected.txt

    r140975 r168350  
    44
    55
    6 PASS viewPreserveAspectRatio = svgView.preserveAspectRatio; is null
    7 PASS viewTransform = svgView.transform; is null
     6FAIL viewPreserveAspectRatio = svgView.preserveAspectRatio; should be null. Was [object SVGAnimatedPreserveAspectRatio].
     7FAIL viewTransform = svgView.transform; should be null. Was [object SVGTransformList].
    88PASS viewViewTarget = svgView.viewTarget; is null
    9 PASS viewViewBox = svgView.viewBox; is null
     9FAIL viewViewBox = svgView.viewBox; should be null. Was [object SVGAnimatedRect].
    1010PASS successfullyParsed is true
    1111
  • trunk/LayoutTests/svg/dom/parent-view-layout-crash-expected.txt

    r105250 r168350  
    1 Test passes if it does not crash. 
     1Test passes if it does not crash.   
  • trunk/LayoutTests/svg/dom/stylesheet-candidate-node-crash-main-expected.txt

    r93227 r168350  
    1 Test passes if it does not crash.
     1Test passes if it does not crash.  
  • trunk/LayoutTests/svg/dom/svg-root-lengths.html

    r160774 r168350  
    77    <p id="description"></p>
    88    <div id="div" style="width: 200px; height: 200px; border: 1px solid red;">
    9       <svg id="svg" xmlns="http://www.w3.org/2000/svg" style="border: 1px solid blue;">
     9      <svg id="svg" xmlns="http://www.w3.org/2000/svg" style="width: 100%; height: 100%; border: 1px solid blue;">
    1010        <rect width="100%" height="100%" fill="green"/>
    1111      </svg>
  • trunk/LayoutTests/svg/foreignObject/absolute-position-foreign-object-child-crash-expected.txt

    r167539 r168350  
    1 PASS
     1 PASS
  • trunk/LayoutTests/svg/path-arc-invalid-expected.txt

    r98344 r168350  
    11CONSOLE MESSAGE: line 6: Error: Problem parsing d="M0 0 A0 0 0 0 0 0 0 0 0 0"
    2 If this text is visible the malformed SVG path is handled correctly.
     2 If this text is visible the malformed SVG path is handled correctly.
  • trunk/LayoutTests/svg/repaint/repaint-webkit-svg-shadow-container-expected.txt

    r163021 r168350  
    11 (repaint rects
    2   (rect 8 8 340 340)
    3   (rect 8 8 594 594)
    4   (rect 8 8 720 600)
     2  (rect 8 8 300 150)
     3  (rect 8 8 300 150)
    54)
    65
  • trunk/LayoutTests/svg/text/append-text-node-to-tspan.html

    r106918 r168350  
    66</head>
    77<body onload="runRepaintTest()">
    8 <svg style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px">
     8<svg style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%">
    99    <title>You should see the word PASS three times</title>
    1010    <text transform="translate(10, 50) scale(10 10)" font-size="12">
  • trunk/LayoutTests/svg/text/kerning.svg

    r31342 r168350  
    66
    77<div style="width: 800px; height: 200px;">
    8 <svg xmlns="http://www.w3.org/2000/svg">
     8<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
    99<font>
    1010<font-face font-family="xyzzy" units-per-em="100" ascent="100" descent="500">
  • trunk/LayoutTests/svg/text/modify-text-node-in-tspan.html

    r106918 r168350  
    66</head>
    77<body onload="runRepaintTest()">
    8 <svg style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px">
     8<svg style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%">
    99    <title>You should see the word PASS three times</title>
    1010    <text transform="translate(10, 50) scale(10 10)" font-size="12">
  • trunk/LayoutTests/svg/text/multichar-glyph.svg

    r68976 r168350  
    66
    77<div style="width: 800px; height: 200px;">
    8 <svg xmlns="http://www.w3.org/2000/svg">
     8<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
    99<font>
    1010<font-face font-family="xyzzy" units-per-em="100" ascent="100" descent="500">
  • trunk/LayoutTests/svg/text/remove-text-node-from-tspan.html

    r106918 r168350  
    66</head>
    77<body onload="runRepaintTest()">
    8 <svg style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px">
     8<svg style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%">
    99    <title>You should see the word PASS two times</title>
    1010    <text transform="translate(10, 50) scale(10 10)" font-size="12">
  • trunk/LayoutTests/svg/text/remove-tspan-from-text.html

    r106918 r168350  
    66</head>
    77<body onload="runRepaintTest()">
    8 <svg style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px">
     8<svg style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%">
    99    <title>You should see the word PASS two times</title>
    1010    <text id="text" transform="translate(10, 50) scale(10 10)" font-size="12">
  • trunk/LayoutTests/svg/text/svg-rtl-text-crash-expected.txt

    r83607 r168350  
    11*
    2 PASS
     2 PASS
  • trunk/LayoutTests/svg/text/text-block-child-crash-expected.txt

    r84085 r168350  
    1 Test passes if it does not crash.
     1Test passes if it does not crash. 
    22
  • trunk/LayoutTests/svg/transforms/animated-path-inside-transformed-html.xhtml

    r106918 r168350  
    1919  <p>CSS Transformed HTML div with SVG inside it. Animated SVG should repaint correctly.</p>
    2020  <div class="box">
    21       <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 480 360">
     21      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 480 420">
    2222        <rect id="rect" stroke-width="5" fill="blue" stroke="pink" width="100" height="100" />
    2323        <text id="text" x="150" stroke-width="2px" stroke="green" font-size="20px">This is some text</text>
  • trunk/LayoutTests/svg/transforms/svg-css-transforms-clip-path.xhtml

    r101062 r168350  
    3333      -webkit-transform-origin: top left; /* to match SVG */
    3434    }
     35
     36    svg { width: 100%; height: 100% }
    3537   
    3638    .final {
  • trunk/LayoutTests/svg/transforms/transform-origin-css-property.xhtml

    r110532 r168350  
    55    top: 0;
    66    left: 0;
     7    width: 100%;
     8    height: 100%;
    79}
    810
  • trunk/LayoutTests/svg/zoom/page/zoom-foreignObject.svg

    r112022 r168350  
    1414<!-- SVG FO text -->
    1515<foreignObject x="260" width="250" height="200">
    16   <svg xmlns="http://www.w3.org/2000/svg">
     16  <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%">
    1717    <g transform="scale(3) skewY(5) skewX(5)">
    1818      <text y="16">This is a text</text>
  • trunk/LayoutTests/svg/zoom/page/zoom-svg-as-relative-image.html

    r106918 r168350  
    1111<body style='margin: 0px' onload="runRepaintTest()">
    1212<div>
    13   <img src='../../as-image/resources/green-relative-size-rect.svg'>
     13  <img style='width:100%; height:100%' src='../../as-image/resources/green-relative-size-rect.svg'>
    1414</div>
    1515
  • trunk/LayoutTests/svg/zoom/text/zoom-foreignObject.svg

    r112022 r168350  
    1414<!-- SVG FO text -->
    1515<foreignObject x="260" width="250" height="200">
    16   <svg xmlns="http://www.w3.org/2000/svg">
     16  <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="200">
    1717    <g transform="scale(3) skewY(5) skewX(5)">
    1818      <text y="16">This is a text</text>
  • trunk/Source/WebCore/ChangeLog

    r168342 r168350  
     12014-05-05  Dirk Schulze  <krit@webkit.org>
     2
     3        Adapt inline SVG sizing behavior to Firefox and Blink
     4        https://bugs.webkit.org/show_bug.cgi?id=132569
     5
     6        Reviewed by Dean Jackson.
     7
     8        This patch is ported from Blink CR 308992. Thanks to David Vest for helping
     9        with back porting his Blink patch. From the commit message:
     10
     11        "The basis of this change is to map explicit width and height
     12        attributes to CSS properties, essentially promoting them to
     13        presentation attributes. Note that implicit "100%" width and height
     14        are not mapped.
     15       
     16        This enables us to remove the concept of "percentage intrinsic size"
     17        and rely on normal CSS rules to resolve percentage values.
     18       
     19        The change has been approved by the SVG WG and the spec is being
     20        updated. Minutes here:
     21       
     22        http://www.w3.org/2014/04/07-svg-minutes.html#item03"
     23
     24        The new model was indeed approved by the SVG WG and is basically following
     25        the CSS 2.1 model for replaced elements.
     26
     27        With this patch WebKit, Firefox and Blink have the same behavior for inline SVG.
     28        This is the first successful approach to unify the sizing behavior of SVG
     29        across UAs.
     30
     31        Tests: svg/as-object/sizing/svg-in-object-placeholder-height-auto.html
     32               svg/as-object/sizing/svg-in-object-placeholder-height-fixed.html
     33               svg/as-object/sizing/svg-in-object-placeholder-height-percentage.html
     34               svg/in-html/sizing/svg-inline.html
     35
     36        * css/svg.css: Root SVG elements still need to be sized with height: 100% and
     37            width: 100%. This is necessary since width and height are presentation
     38            attributes now.
     39        (svg:root):
     40        * rendering/RenderBox.h:
     41        (WebCore::RenderBox::computeIntrinsicRatioInformation): Remove all special
     42            behavior for intrinsic and percentage based sizes in SVG. This simplifies and
     43            unifies the code a lot. Most of the logic that is used is in RenderBox and
     44            RenderReplaced now. RenderSVGRoot was cleaned up a lot and is much lighter.
     45            And so it SVGSVGElement.
     46        * rendering/RenderBoxModelObject.cpp:
     47        (WebCore::RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight):
     48        (WebCore::RenderBoxModelObject::calculateImageIntrinsicDimensions):
     49        * rendering/RenderImage.cpp:
     50        (WebCore::RenderImage::computeIntrinsicRatioInformation):
     51        * rendering/RenderImage.h:
     52        * rendering/RenderReplaced.cpp:
     53        (WebCore::RenderReplaced::computeAspectRatioInformationForRenderBox):
     54        (WebCore::RenderReplaced::computeIntrinsicRatioInformation):
     55        (WebCore::RenderReplaced::computeReplacedLogicalWidth):
     56        (WebCore::RenderReplaced::computeReplacedLogicalHeight):
     57        (WebCore::RenderReplaced::computePreferredLogicalWidths):
     58        * rendering/RenderReplaced.h:
     59        * rendering/svg/RenderSVGRoot.cpp:
     60        (WebCore::RenderSVGRoot::computeIntrinsicRatioInformation):
     61        (WebCore::RenderSVGRoot::computeReplacedLogicalWidth):
     62        (WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
     63        (WebCore::RenderSVGRoot::hasRelativeDimensions):
     64        (WebCore::RenderSVGRoot::hasRelativeIntrinsicLogicalWidth): Deleted.
     65        (WebCore::RenderSVGRoot::hasRelativeLogicalHeight): Deleted.
     66        * rendering/svg/RenderSVGRoot.h:
     67        * svg/SVGElement.h:
     68        (WebCore::SVGElement::invalidateSVGPresentationAttributeStyle):
     69        * svg/SVGSVGElement.cpp:
     70        (WebCore::SVGSVGElement::isPresentationAttribute):
     71        (WebCore::SVGSVGElement::collectStyleForPresentationAttribute):
     72        (WebCore::SVGSVGElement::svgAttributeChanged):
     73        (WebCore::SVGSVGElement::currentViewportSize):
     74        (WebCore::SVGSVGElement::hasIntrinsicWidth):
     75        (WebCore::SVGSVGElement::hasIntrinsicHeight):
     76        (WebCore::SVGSVGElement::intrinsicWidth):
     77        (WebCore::SVGSVGElement::intrinsicHeight):
     78        (WebCore::SVGSVGElement::widthAttributeEstablishesViewport): Deleted.
     79        (WebCore::SVGSVGElement::heightAttributeEstablishesViewport): Deleted.
     80        * svg/SVGSVGElement.h:
     81        * svg/graphics/SVGImage.cpp:
     82        (WebCore::SVGImage::containerSize):
     83        * xml/XMLErrors.cpp: If an error occurs in a stand alone SVG file, we create
     84            an XHTML document with the error message and append the SVG file.
     85            This SVG file now follows the CSS sizing behavior as inline SVG.
     86            Therefore, we need to set width and height to 100% explicitly.
     87        (WebCore::XMLErrors::insertErrorMessageBlock):
     88
    1892014-05-05  Ryuan Choi  <ryuan.choi@samsung.com>
    290
  • trunk/Source/WebCore/css/svg.css

    r165676 r168350  
    4848}
    4949
     50svg:root {
     51    width: 100%;
     52    height: 100%
     53}
     54
    5055text, foreignObject {
    5156    display: block
  • trunk/Source/WebCore/rendering/RenderBox.h

    r167988 r168350  
    564564
    565565    virtual bool needsPreferredWidthsRecalculation() const;
    566     virtual void computeIntrinsicRatioInformation(FloatSize& /* intrinsicSize */, double& /* intrinsicRatio */, bool& /* isPercentageIntrinsicSize */) const { }
     566    virtual void computeIntrinsicRatioInformation(FloatSize& /* intrinsicSize */, double& /* intrinsicRatio */) const { }
    567567
    568568    IntSize scrolledContentOffset() const;
  • trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r167910 r168350  
    242242    if (cb->isTableCell())
    243243        return false;
    244    
     244
     245    // Match RenderBox::availableLogicalHeightUsing by special casing
     246    // the render view. The available height is taken from the frame.
     247    if (cb->isRenderView())
     248        return false;
     249
    245250    if (!cb->style().logicalHeight().isAuto() || (!cb->style().logicalTop().isAuto() && !cb->style().logicalBottom().isAuto()))
    246251        return false;
     
    897902    image->computeIntrinsicDimensions(this, intrinsicWidth, intrinsicHeight, intrinsicRatio);
    898903
    899     // Intrinsic dimensions expressed as percentages must be resolved relative to the dimensions of the rectangle
    900     // that establishes the coordinate system for the 'background-position' property.
    901    
    902     // FIXME: Remove unnecessary rounding when layout is off ints: webkit.org/b/63656
    903     if (intrinsicWidth.isPercentNotCalculated() && intrinsicHeight.isPercentNotCalculated() && intrinsicRatio.isEmpty()) {
    904         // Resolve width/height percentages against positioningAreaSize, only if no intrinsic ratio is provided.
    905         float resolvedWidth = positioningAreaSize.width() * intrinsicWidth.percent() / 100;
    906         float resolvedHeight = positioningAreaSize.height() * intrinsicHeight.percent() / 100;
    907         return LayoutSize(resolvedWidth, resolvedHeight);
    908     }
    909 
    910     LayoutSize resolvedSize(intrinsicWidth.isFixed() ? intrinsicWidth.value() : 0, intrinsicHeight.isFixed() ? intrinsicHeight.value() : 0);
     904    ASSERT(!intrinsicWidth.isPercent());
     905    ASSERT(!intrinsicHeight.isPercent());
     906
     907    LayoutSize resolvedSize(intrinsicWidth.value(), intrinsicHeight.value());
    911908    LayoutSize minimumSize(resolvedSize.width() > 0 ? 1 : 0, resolvedSize.height() > 0 ? 1 : 0);
    912909    if (shouldScaleOrNot == ScaleByEffectiveZoom)
  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r167786 r168350  
    720720}
    721721
    722 void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const
    723 {
    724     RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
     722void RenderImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
     723{
     724    RenderReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);
    725725
    726726    // Our intrinsicSize is empty if we're rendering generated images with relative width/height. Figure out the right intrinsic size to use.
  • trunk/Source/WebCore/rendering/RenderImage.h

    r166100 r168350  
    7070    virtual bool needsPreferredWidthsRecalculation() const override final;
    7171    virtual RenderBox* embeddedContentBox() const override final;
    72     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const override final;
     72    virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override final;
    7373    virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const override;
    7474
  • trunk/Source/WebCore/rendering/RenderReplaced.cpp

    r167810 r168350  
    277277}
    278278
    279 void RenderReplaced::computeAspectRatioInformationForRenderBox(RenderBox* contentRenderer, FloatSize& constrainedSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const
     279void RenderReplaced::computeAspectRatioInformationForRenderBox(RenderBox* contentRenderer, FloatSize& constrainedSize, double& intrinsicRatio) const
    280280{
    281281    FloatSize intrinsicSize;
    282282    if (contentRenderer) {
    283         contentRenderer->computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
    284         if (intrinsicRatio)
    285             ASSERT(!isPercentageIntrinsicSize);
     283        contentRenderer->computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);
    286284
    287285        // Handle zoom & vertical writing modes here, as the embedded document doesn't know about them.
    288         if (!isPercentageIntrinsicSize) {
    289             intrinsicSize.scale(style().effectiveZoom());
    290             if (isRenderImage())
    291                 intrinsicSize.scale(toRenderImage(this)->imageDevicePixelRatio());
    292         }
    293 
    294         if (hasAspectRatio() && isPercentageIntrinsicSize)
    295             intrinsicRatio = 1;
    296            
     286        intrinsicSize.scale(style().effectiveZoom());
     287
     288        if (isRenderImage())
     289            intrinsicSize.scale(toRenderImage(this)->imageDevicePixelRatio());
     290
    297291        // Update our intrinsic size to match what the content renderer has computed, so that when we
    298292        // constrain the size below, the correct intrinsic size will be obtained for comparison against
    299293        // min and max widths.
    300         if (intrinsicRatio && !isPercentageIntrinsicSize && !intrinsicSize.isEmpty())
     294        if (intrinsicRatio && !intrinsicSize.isEmpty())
    301295            m_intrinsicSize = LayoutSize(intrinsicSize);
    302296
     
    307301        }
    308302    } else {
    309         computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
    310         if (intrinsicRatio) {
    311             ASSERT(!isPercentageIntrinsicSize);
    312             if (!intrinsicSize.isEmpty())
    313                 m_intrinsicSize = LayoutSize(isHorizontalWritingMode() ? intrinsicSize : intrinsicSize.transposedSize());
    314         }
     303        computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);
     304        if (intrinsicRatio && !intrinsicSize.isEmpty())
     305            m_intrinsicSize = LayoutSize(isHorizontalWritingMode() ? intrinsicSize : intrinsicSize.transposedSize());
    315306    }
    316307
     
    322313    // function was added, since all it has done is make the code more unclear.
    323314    constrainedSize = intrinsicSize;
    324     if (intrinsicRatio && !isPercentageIntrinsicSize && !intrinsicSize.isEmpty() && style().logicalWidth().isAuto() && style().logicalHeight().isAuto()) {
     315    if (intrinsicRatio && !intrinsicSize.isEmpty() && style().logicalWidth().isAuto() && style().logicalHeight().isAuto()) {
    325316        // We can't multiply or divide by 'intrinsicRatio' here, it breaks tests, like fast/images/zoomed-img-size.html, which
    326317        // can only be fixed once subpixel precision is available for things like intrinsicWidth/Height - which include zoom!
     
    365356}
    366357
    367 void RenderReplaced::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const
     358void RenderReplaced::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
    368359{
    369360    // If there's an embeddedContentBox() of a remote, referenced document available, this code-path should never be used.
    370361    ASSERT(!embeddedContentBox());
    371     isPercentageIntrinsicSize = false;
    372362    intrinsicSize = FloatSize(intrinsicLogicalWidth(), intrinsicLogicalHeight());
    373363
     
    387377
    388378    // 10.3.2 Inline, replaced elements: http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width
    389     bool isPercentageIntrinsicSize = false;
    390379    double intrinsicRatio = 0;
    391380    FloatSize constrainedSize;
    392     computeAspectRatioInformationForRenderBox(contentRenderer, constrainedSize, intrinsicRatio, isPercentageIntrinsicSize);
     381    computeAspectRatioInformationForRenderBox(contentRenderer, constrainedSize, intrinsicRatio);
    393382
    394383    if (style().logicalWidth().isAuto()) {
    395         bool heightIsAuto = style().logicalHeight().isAuto();
    396         bool hasIntrinsicWidth = !isPercentageIntrinsicSize && constrainedSize.width() > 0;
     384        bool computedHeightIsAuto = hasAutoHeightOrContainingBlockWithAutoHeight();
     385        bool hasIntrinsicWidth = constrainedSize.width() > 0;
    397386
    398387        // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic width, then that intrinsic width is the used value of 'width'.
    399         if (heightIsAuto && hasIntrinsicWidth)
     388        if (computedHeightIsAuto && hasIntrinsicWidth)
    400389            return computeReplacedLogicalWidthRespectingMinMaxWidth(constrainedSize.width(), shouldComputePreferred);
    401390
    402         bool hasIntrinsicHeight = !isPercentageIntrinsicSize && constrainedSize.height() > 0;
    403         if (intrinsicRatio || isPercentageIntrinsicSize) {
     391        bool hasIntrinsicHeight = constrainedSize.height() > 0;
     392        if (intrinsicRatio) {
    404393            // If 'height' and 'width' both have computed values of 'auto' and the element has no intrinsic width, but does have an intrinsic height and intrinsic ratio;
    405394            // or if 'width' has a computed value of 'auto', 'height' has some other computed value, and the element does have an intrinsic ratio; then the used value
    406395            // of 'width' is: (used height) * (intrinsic ratio)
    407             if (intrinsicRatio && ((heightIsAuto && !hasIntrinsicWidth && hasIntrinsicHeight) || !heightIsAuto)) {
     396            if (intrinsicRatio && ((computedHeightIsAuto && !hasIntrinsicWidth && hasIntrinsicHeight) || !computedHeightIsAuto)) {
    408397                LayoutUnit logicalHeight = computeReplacedLogicalHeight();
    409398                return computeReplacedLogicalWidthRespectingMinMaxWidth(roundToInt(round(logicalHeight * intrinsicRatio)), shouldComputePreferred);
     
    413402            // 'width' is undefined in CSS 2.1. However, it is suggested that, if the containing block's width does not itself depend on the replaced element's width, then
    414403            // the used value of 'width' is calculated from the constraint equation used for block-level, non-replaced elements in normal flow.
    415             if (heightIsAuto && !hasIntrinsicWidth && !hasIntrinsicHeight) {
     404            if (computedHeightIsAuto && !hasIntrinsicWidth && !hasIntrinsicHeight) {
    416405                // The aforementioned 'constraint equation' used for block-level, non-replaced elements in normal flow:
    417406                // 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
     
    426415                LayoutUnit marginEnd = minimumValueForLength(style().marginEnd(), logicalWidth);
    427416                logicalWidth = std::max<LayoutUnit>(0, logicalWidth - (marginStart + marginEnd + (width() - clientWidth())));
    428                 if (isPercentageIntrinsicSize)
    429                     logicalWidth = logicalWidth * constrainedSize.width() / 100;
    430417                return computeReplacedLogicalWidthRespectingMinMaxWidth(logicalWidth, shouldComputePreferred);
    431418            }
     
    455442
    456443    // 10.6.2 Inline, replaced elements: http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height
    457     bool isPercentageIntrinsicSize = false;
    458444    double intrinsicRatio = 0;
    459445    FloatSize constrainedSize;
    460     computeAspectRatioInformationForRenderBox(contentRenderer, constrainedSize, intrinsicRatio, isPercentageIntrinsicSize);
     446    computeAspectRatioInformationForRenderBox(contentRenderer, constrainedSize, intrinsicRatio);
    461447
    462448    bool widthIsAuto = style().logicalWidth().isAuto();
    463     bool hasIntrinsicHeight = !isPercentageIntrinsicSize && constrainedSize.height() > 0;
     449    bool hasIntrinsicHeight = constrainedSize.height() > 0;
    464450
    465451    // If 'height' and 'width' both have computed values of 'auto' and the element also has an intrinsic height, then that intrinsic height is the used value of 'height'.
     
    498484
    499485    const RenderStyle& styleToUse = style();
    500     if (styleToUse.logicalWidth().isPercent() || styleToUse.logicalMaxWidth().isPercent() || hasRelativeIntrinsicLogicalWidth())
     486    if (styleToUse.logicalWidth().isPercent() || styleToUse.logicalMaxWidth().isPercent())
    501487        m_minPreferredLogicalWidth = 0;
    502488
  • trunk/Source/WebCore/rendering/RenderReplaced.h

    r167803 r168350  
    4949
    5050    virtual LayoutSize intrinsicSize() const override final { return m_intrinsicSize; }
    51     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const override;
     51    virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override;
    5252
    5353    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override final;
     
    8585
    8686    virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) override final;
    87     void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const;
     87    void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio) const;
    8888
    8989    mutable LayoutSize m_intrinsicSize;
  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

    r166920 r168350  
    7171}
    7272
    73 void RenderSVGRoot::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const
     73void RenderSVGRoot::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
    7474{
    7575    // Spec: http://www.w3.org/TR/SVG/coords.html#IntrinsicSizing
    7676    // SVG needs to specify how to calculate some intrinsic sizing properties to enable inclusion within other languages.
    77     // The intrinsic width and height of the viewport of SVG content must be determined from the ‘width’ and ‘height’ attributes.
    78     // If either of these are not specified, a value of '100%' must be assumed. Note: the ‘width’ and ‘height’ attributes are not
    79     // the same as the CSS width and height properties. Specifically, percentage values do not provide an intrinsic width or height,
    80     // and do not indicate a percentage of the containing block. Rather, once the viewport is established, they indicate the portion
    81     // of the viewport that is actually covered by image data.
    82     Length intrinsicWidthAttribute = svgSVGElement().intrinsicWidth(SVGSVGElement::IgnoreCSSProperties);
    83     Length intrinsicHeightAttribute = svgSVGElement().intrinsicHeight(SVGSVGElement::IgnoreCSSProperties);
    8477
    8578    // The intrinsic aspect ratio of the viewport of SVG content is necessary for example, when including SVG from an ‘object’
     
    9083    //   px, em, ex) or in user units, then the aspect ratio is calculated from the ‘width’ and ‘height’ attributes after
    9184    //   resolving both values to user units.
    92     if (intrinsicWidthAttribute.isFixed() || intrinsicHeightAttribute.isFixed()) {
    93         if (intrinsicWidthAttribute.isFixed())
    94             intrinsicSize.setWidth(floatValueForLength(intrinsicWidthAttribute, 0));
    95         if (intrinsicHeightAttribute.isFixed())
    96             intrinsicSize.setHeight(floatValueForLength(intrinsicHeightAttribute, 0));
    97         if (!intrinsicSize.isEmpty())
    98             intrinsicRatio = intrinsicSize.width() / static_cast<double>(intrinsicSize.height());
    99         return;
    100     }
    101 
    102     // - If either/both of the ‘width’ and ‘height’ of the rootmost ‘svg’ element are in percentage units (or omitted), the
    103     //   aspect ratio is calculated from the width and height values of the ‘viewBox’ specified for the current SVG document
    104     //   fragment. If the ‘viewBox’ is not correctly specified, or set to 'none', the intrinsic aspect ratio cannot be
    105     //   calculated and is considered unspecified.
    106     intrinsicSize = svgSVGElement().viewBox().size();
    107     if (!intrinsicSize.isEmpty()) {
    108         // The viewBox can only yield an intrinsic ratio, not an intrinsic size.
     85    intrinsicSize.setWidth(floatValueForLength(svgSVGElement().intrinsicWidth(), 0));
     86    intrinsicSize.setHeight(floatValueForLength(svgSVGElement().intrinsicHeight(), 0));
     87
     88
     89    if (!intrinsicSize.isEmpty())
    10990        intrinsicRatio = intrinsicSize.width() / static_cast<double>(intrinsicSize.height());
    110         intrinsicSize = FloatSize();
    111         return;
    112     }
    113 
    114     // If our intrinsic size is in percentage units, return those to the caller through the intrinsicSize. Notify the caller
    115     // about the special situation, by setting isPercentageIntrinsicSize=true, so it knows how to interpret the return values.
    116     if (intrinsicWidthAttribute.isPercentNotCalculated() && intrinsicHeightAttribute.isPercentNotCalculated()) {
    117         isPercentageIntrinsicSize = true;
    118         intrinsicSize = FloatSize(intrinsicWidthAttribute.percent(), intrinsicHeightAttribute.percent());
     91    else {
     92        // - If either/both of the ‘width’ and ‘height’ of the rootmost ‘svg’ element are in percentage units (or omitted), the
     93        //   aspect ratio is calculated from the width and height values of the ‘viewBox’ specified for the current SVG document
     94        //   fragment. If the ‘viewBox’ is not correctly specified, or set to 'none', the intrinsic aspect ratio cannot be
     95        //   calculated and is considered unspecified.
     96        FloatSize viewBoxSize = svgSVGElement().viewBox().size();
     97        if (!viewBoxSize.isEmpty()) {
     98            // The viewBox can only yield an intrinsic ratio, not an intrinsic size.
     99            intrinsicRatio = viewBoxSize.width() / static_cast<double>(viewBoxSize.height());
     100        }
    119101    }
    120102}
     
    145127        return m_containerSize.width();
    146128
     129    if (isEmbeddedThroughFrameContainingSVGDocument())
     130        return containingBlock()->availableLogicalWidth();
     131
    147132    if (style().logicalWidth().isSpecified() || style().logicalMaxWidth().isSpecified())
    148133        return RenderReplaced::computeReplacedLogicalWidth(shouldComputePreferred);
    149134
    150     if (svgSVGElement().widthAttributeEstablishesViewport())
    151         return resolveLengthAttributeForSVG(svgSVGElement().intrinsicWidth(SVGSVGElement::IgnoreCSSProperties), style().effectiveZoom(), containingBlock()->availableLogicalWidth(), &view());
    152 
    153     // SVG embedded through object/embed/iframe.
    154     if (isEmbeddedThroughFrameContainingSVGDocument())
    155         return frame().ownerRenderer()->availableLogicalWidth();
     135    if (svgSVGElement().hasIntrinsicWidth())
     136        return resolveLengthAttributeForSVG(svgSVGElement().intrinsicWidth(), style().effectiveZoom(), containingBlock()->availableLogicalWidth(), &view());
    156137
    157138    // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.
     
    165146        return m_containerSize.height();
    166147
     148    if (isEmbeddedThroughFrameContainingSVGDocument())
     149        return containingBlock()->availableLogicalHeight(IncludeMarginBorderPadding);
     150
    167151    if (style().logicalHeight().isSpecified() || style().logicalMaxHeight().isSpecified())
    168152        return RenderReplaced::computeReplacedLogicalHeight();
    169153
    170     if (svgSVGElement().heightAttributeEstablishesViewport()) {
    171         Length height = svgSVGElement().intrinsicHeight(SVGSVGElement::IgnoreCSSProperties);
    172         if (height.isPercent()) {
    173             RenderBlock* cb = containingBlock();
    174             ASSERT(cb);
    175             while (cb->isAnonymous() && !cb->isRenderView()) {
    176                 cb = cb->containingBlock();
    177                 cb->addPercentHeightDescendant(const_cast<RenderSVGRoot&>(*this));
    178             }
    179         } else
    180             RenderBlock::removePercentHeightDescendant(const_cast<RenderSVGRoot&>(*this));
    181 
    182         return resolveLengthAttributeForSVG(height, style().effectiveZoom(), containingBlock()->availableLogicalHeight(IncludeMarginBorderPadding), &view());
    183     }
    184 
    185     // SVG embedded through object/embed/iframe.
    186     if (isEmbeddedThroughFrameContainingSVGDocument())
    187         return frame().ownerRenderer()->availableLogicalHeight(IncludeMarginBorderPadding);
     154    if (svgSVGElement().hasIntrinsicHeight())
     155        return resolveLengthAttributeForSVG(svgSVGElement().intrinsicHeight(), style().effectiveZoom(), containingBlock()->availableLogicalHeight(IncludeMarginBorderPadding).toFloat(), &view());
    188156
    189157    // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.
     
    438406bool RenderSVGRoot::hasRelativeDimensions() const
    439407{
    440     return svgSVGElement().intrinsicHeight(SVGSVGElement::IgnoreCSSProperties).isPercent() || svgSVGElement().intrinsicWidth(SVGSVGElement::IgnoreCSSProperties).isPercent();
    441 }
    442 
    443 bool RenderSVGRoot::hasRelativeIntrinsicLogicalWidth() const
    444 {
    445     return svgSVGElement().intrinsicWidth(SVGSVGElement::IgnoreCSSProperties).isPercent();
    446 }
    447 
    448 bool RenderSVGRoot::hasRelativeLogicalHeight() const
    449 {
    450     return svgSVGElement().intrinsicHeight(SVGSVGElement::IgnoreCSSProperties).isPercent();
     408    return svgSVGElement().intrinsicHeight().isPercent() || svgSVGElement().intrinsicWidth().isPercent();
    451409}
    452410
  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

    r166124 r168350  
    4545    bool isEmbeddedThroughFrameContainingSVGDocument() const;
    4646
    47     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const override;
     47    virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override;
    4848
    4949    bool isLayoutSizeChanged() const { return m_isLayoutSizeChanged; }
     
    5656
    5757    virtual bool hasRelativeDimensions() const override;
    58     virtual bool hasRelativeIntrinsicLogicalWidth() const override;
    59     virtual bool hasRelativeLogicalHeight() const override;
    6058
    6159    // localToBorderBoxTransform maps local SVG viewport coordinates to local CSS box coordinates. 
  • trunk/Source/WebCore/svg/SVGElement.h

    r168313 r168350  
    9797
    9898    void invalidateSVGAttributes() { ensureUniqueElementData().setAnimatedSVGAttributesAreDirty(true); }
     99    void invalidateSVGPresentationAttributeStyle() { ensureUniqueElementData().setPresentationAttributeStyleIsDirty(true); }
    99100
    100101    const HashSet<SVGElementInstance*>& instancesForElement() const;
  • trunk/Source/WebCore/svg/SVGSVGElement.cpp

    r165607 r168350  
    271271}
    272272
     273bool SVGSVGElement::isPresentationAttribute(const QualifiedName& name) const
     274{
     275    if (isOutermostSVGSVGElement() && (name == SVGNames::widthAttr || name == SVGNames::heightAttr))
     276        return true;
     277    return SVGGraphicsElement::isPresentationAttribute(name);
     278}
     279
     280void SVGSVGElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStyleProperties& style)
     281{
     282    if (isOutermostSVGSVGElement() && (name == SVGNames::widthAttr || name == SVGNames::heightAttr)) {
     283        if (name == SVGNames::widthAttr)
     284            addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, value);
     285        else if (name == SVGNames::heightAttr)
     286            addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, value);
     287    } else
     288        SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);
     289}
     290
    273291void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName)
    274292{
    275293    bool updateRelativeLengthsOrViewBox = false;
    276294    bool widthChanged = attrName == SVGNames::widthAttr;
    277     if (widthChanged
    278         || attrName == SVGNames::heightAttr
     295    bool heightChanged = attrName == SVGNames::heightAttr;
     296    if (widthChanged || heightChanged
    279297        || attrName == SVGNames::xAttr
    280298        || attrName == SVGNames::yAttr) {
     
    282300        updateRelativeLengthsInformation();
    283301
    284         // At the SVG/HTML boundary (aka RenderSVGRoot), the width attribute can
    285         // affect the replaced size so we need to mark it for updating.
    286         if (widthChanged) {
     302        // At the SVG/HTML boundary (aka RenderSVGRoot), the width and
     303        // height attributes can affect the replaced size so we need
     304        // to mark it for updating.
     305        if (widthChanged || heightChanged) {
     306            // FIXME: This is a hack to synchronize changes from SVG DOM earlier in the
     307            // run. We need these changes in the style calculation process earlier than
     308            // usual.
     309            synchronizeAllAttributes();
    287310            RenderObject* renderObject = renderer();
    288             if (renderObject && renderObject->isSVGRoot())
    289                 toRenderSVGRoot(renderObject)->setNeedsLayoutAndPrefWidthsRecalc();
     311            if (renderObject && renderObject->isSVGRoot()) {
     312                invalidateSVGPresentationAttributeStyle();
     313                setNeedsStyleRecalc();
     314            }
    290315        }
    291316    }
     
    570595FloatSize SVGSVGElement::currentViewportSize() const
    571596{
    572     Length intrinsicWidth = this->intrinsicWidth();
    573     Length intrinsicHeight = this->intrinsicHeight();
    574     if (intrinsicWidth.isFixed() && intrinsicHeight.isFixed())
     597    if (hasIntrinsicWidth() && hasIntrinsicHeight()) {
     598        Length intrinsicWidth = this->intrinsicWidth();
     599        Length intrinsicHeight = this->intrinsicHeight();
    575600        return FloatSize(floatValueForLength(intrinsicWidth, 0), floatValueForLength(intrinsicHeight, 0));
     601    }
    576602
    577603    if (!renderer())
     
    587613}
    588614
    589 bool SVGSVGElement::widthAttributeEstablishesViewport() const
    590 {
    591     if (!renderer() || renderer()->isSVGViewportContainer())
    592         return true;
    593 
    594     // Spec: http://www.w3.org/TR/SVG/coords.html#ViewportSpace
    595     // The ‘width’ attribute on the outermost svg element establishes the viewport's width, unless the following conditions are met:
    596     // - the SVG content is a separately stored resource that is embedded by reference (such as the ‘object’ element in XHTML [XHTML]), or
    597     //   the SVG content is embedded inline within a containing document;
    598     // - and the referencing element or containing document is styled using CSS [CSS2] or XSL [XSL];
    599     // - and there are CSS-compatible positioning properties ([CSS2], section 9.3) specified on the referencing element (e.g., the ‘object’ element)
    600     //   or on the containing document's outermost svg element that are sufficient to establish the width of the viewport. Under these conditions,
    601     //   the positioning properties establish the viewport's width.
    602     RenderSVGRoot* root = toRenderSVGRoot(renderer());
    603 
    604     // SVG embedded through object/embed/iframe.
    605     if (root->isEmbeddedThroughFrameContainingSVGDocument())
    606         return !root->hasReplacedLogicalWidth() && !document().frame()->ownerRenderer()->hasReplacedLogicalWidth();
    607 
    608     // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.
    609     if (root->isEmbeddedThroughSVGImage() || document().documentElement() != this)
    610         return !root->hasReplacedLogicalWidth();
    611 
    612     return true;
    613 }
    614 
    615 bool SVGSVGElement::heightAttributeEstablishesViewport() const
    616 {
    617     if (!renderer() || renderer()->isSVGViewportContainer())
    618         return true;
    619 
    620     // Spec: http://www.w3.org/TR/SVG/coords.html#IntrinsicSizing
    621     // Similarly, if there are positioning properties specified on the referencing element or on the outermost svg element
    622     // that are sufficient to establish the height of the viewport, then these positioning properties establish the viewport's
    623     // height; otherwise, the ‘height’ attribute on the outermost svg element establishes the viewport's height.
    624     RenderSVGRoot* root = toRenderSVGRoot(renderer());
    625 
    626     // SVG embedded through object/embed/iframe.
    627     if (root->isEmbeddedThroughFrameContainingSVGDocument())
    628         return !root->hasReplacedLogicalHeight() && !document().frame()->ownerRenderer()->hasReplacedLogicalHeight();
    629 
    630     // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SVG.
    631     if (root->isEmbeddedThroughSVGImage() || document().documentElement() != this)
    632         return !root->hasReplacedLogicalHeight();
    633 
    634     return true;
    635 }
    636 
    637 Length SVGSVGElement::intrinsicWidth(ConsiderCSSMode mode) const
    638 {
    639     if (widthAttributeEstablishesViewport() || mode == IgnoreCSSProperties) {
    640         if (width().unitType() == LengthTypePercentage)
    641             return Length(width().valueAsPercentage() * 100, Percent);
    642 
    643         SVGLengthContext lengthContext(this);
    644         return Length(width().value(lengthContext), Fixed);
    645     }
    646 
    647     ASSERT(renderer());
    648     return renderer()->style().width();
    649 }
    650 
    651 Length SVGSVGElement::intrinsicHeight(ConsiderCSSMode mode) const
    652 {
    653     if (heightAttributeEstablishesViewport() || mode == IgnoreCSSProperties) {
    654         if (height().unitType() == LengthTypePercentage)
    655             return Length(height().valueAsPercentage() * 100, Percent);
    656 
    657         SVGLengthContext lengthContext(this);
    658         return Length(height().value(lengthContext), Fixed);
    659     }
    660 
    661     ASSERT(renderer());
    662     return renderer()->style().height();
     615bool SVGSVGElement::hasIntrinsicWidth() const
     616{
     617    return width().unitType() != LengthTypePercentage;
     618}
     619
     620bool SVGSVGElement::hasIntrinsicHeight() const
     621{
     622    return height().unitType() != LengthTypePercentage;
     623}
     624
     625Length SVGSVGElement::intrinsicWidth() const
     626{
     627    if (width().unitType() == LengthTypePercentage)
     628        return Length(0, Fixed);
     629
     630    SVGLengthContext lengthContext(this);
     631    return Length(width().value(lengthContext), Fixed);
     632}
     633
     634Length SVGSVGElement::intrinsicHeight() const
     635{
     636    if (height().unitType() == LengthTypePercentage)
     637        return Length(0, Fixed);
     638
     639    SVGLengthContext lengthContext(this);
     640    return Length(height().value(lengthContext), Fixed);
    663641}
    664642
  • trunk/Source/WebCore/svg/SVGSVGElement.h

    r168313 r168350  
    6969    SVGViewSpec* currentView();
    7070
    71     enum ConsiderCSSMode {
    72         RespectCSSProperties,
    73         IgnoreCSSProperties
    74     };
    75 
    7671    // RenderSVGRoot wants to query the intrinsic size, by only examining the width/height attributes.
    77     Length intrinsicWidth(ConsiderCSSMode = RespectCSSProperties) const;
    78     Length intrinsicHeight(ConsiderCSSMode = RespectCSSProperties) const;
     72    Length intrinsicWidth() const;
     73    Length intrinsicHeight() const;
    7974    FloatSize currentViewportSize() const;
    8075    FloatRect currentViewBoxRect() const;
     
    122117    void setupInitialView(const String& fragmentIdentifier, Element* anchorNode);
    123118
     119    bool hasIntrinsicWidth() const;
     120    bool hasIntrinsicHeight() const;
     121
    124122    Element* getElementById(const String&);
    125 
    126     bool widthAttributeEstablishesViewport() const;
    127     bool heightAttributeEstablishesViewport() const;
    128123
    129124    SVGZoomAndPanType zoomAndPan() const { return m_zoomAndPan; }
     
    139134
    140135    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
     136    virtual bool isPresentationAttribute(const QualifiedName&) const override;
     137    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
    141138
    142139    virtual bool rendererIsNeeded(const RenderStyle&) override;
  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r167356 r168350  
    121121
    122122    FloatSize currentSize;
    123     if (rootElement->intrinsicWidth().isFixed() && rootElement->intrinsicHeight().isFixed())
     123    if (rootElement->hasIntrinsicWidth() && rootElement->hasIntrinsicHeight())
    124124        currentSize = rootElement->currentViewportSize();
    125125    else
  • trunk/Source/WebCore/xml/XMLErrors.cpp

    r163440 r168350  
    129129    else if (documentElement->namespaceURI() == SVGNames::svgNamespaceURI) {
    130130        RefPtr<Element> rootElement = m_document->createElement(htmlTag, true);
     131        RefPtr<Element> head = m_document->createElement(headTag, true);
     132        RefPtr<Element> style = m_document->createElement(styleTag, true);
     133        head->parserAppendChild(style);
     134        style->parserAppendChild(m_document->createTextNode("html, body { height: 100% } parsererror + svg { width: 100%; height: 100% }"));
     135        style->finishParsingChildren();
     136        rootElement->parserAppendChild(head);
    131137        RefPtr<Element> body = m_document->createElement(bodyTag, true);
    132138        rootElement->parserAppendChild(body);
    133139
    134         documentElement->parentNode()->parserRemoveChild(*documentElement);
     140        m_document->parserRemoveChild(*documentElement);
    135141
    136142        body->parserAppendChild(documentElement);
    137         m_document->parserAppendChild(rootElement.get());
     143        m_document->parserAppendChild(rootElement);
    138144
    139145        documentElement = body.get();
Note: See TracChangeset for help on using the changeset viewer.