Modified: trunk/LayoutTests/svg/css/parse-length-expected.txt (172646 => 172647)
--- trunk/LayoutTests/svg/css/parse-length-expected.txt 2014-08-15 20:37:15 UTC (rev 172646)
+++ trunk/LayoutTests/svg/css/parse-length-expected.txt 2014-08-15 20:48:35 UTC (rev 172647)
@@ -1,3 +1,9 @@
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx=" 100"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx="100 "
+CONSOLE MESSAGE: Error: Invalid negative value for <rect> attribute rx="-200px"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry=" 100"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry="100 "
+CONSOLE MESSAGE: Error: Invalid negative value for <rect> attribute ry="-200px"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute width="auto"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute width=" 100"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute width="100 "
@@ -5,6 +11,16 @@
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute x="100 "
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute y=" 100"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute y="100 "
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx="auto"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx="100 px"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx="100px;"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx="100px !important"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute rx="{ 100px }"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry="auto"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry="100 px"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry="100px;"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry="100px !important"
+CONSOLE MESSAGE: Error: Invalid value for <rect> attribute ry="{ 100px }"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute width="100 px"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute width="100px;"
CONSOLE MESSAGE: Error: Invalid value for <rect> attribute width="100px !important"
@@ -39,6 +55,27 @@
PASS computedStyle("cy", "1ex") is "12.800000190734863px"
PASS computedStyle("cy", "20%") is "20%"
PASS computedStyle("cy", "-200px") is "-200px"
+PASS computedStyle("r", " 100") is "100px"
+PASS computedStyle("r", "100 ") is "100px"
+PASS computedStyle("r", "100px") is "100px"
+PASS computedStyle("r", "1em") is "16px"
+PASS computedStyle("r", "1ex") is "12.800000190734863px"
+PASS computedStyle("r", "20%") is "20%"
+PASS computedStyle("r", "-200px") is "-200px"
+PASS computedStyle("rx", " 100") is "100px"
+PASS computedStyle("rx", "100 ") is "100px"
+PASS computedStyle("rx", "100px") is "100px"
+PASS computedStyle("rx", "1em") is "16px"
+PASS computedStyle("rx", "1ex") is "12.800000190734863px"
+PASS computedStyle("rx", "20%") is "20%"
+PASS computedStyle("rx", "-200px") is "-200px"
+PASS computedStyle("ry", " 100") is "100px"
+PASS computedStyle("ry", "100 ") is "100px"
+PASS computedStyle("ry", "100px") is "100px"
+PASS computedStyle("ry", "1em") is "16px"
+PASS computedStyle("ry", "1ex") is "12.800000190734863px"
+PASS computedStyle("ry", "20%") is "20%"
+PASS computedStyle("ry", "-200px") is "-200px"
PASS computedStyle("width", "auto") is "auto"
PASS computedStyle("width", " 100") is "100px"
PASS computedStyle("width", "100 ") is "100px"
@@ -70,6 +107,21 @@
PASS computedStyle("cy", "100px;") is "0px"
PASS computedStyle("cy", "100px !important") is "0px"
PASS computedStyle("cy", "{ 100px }") is "0px"
+PASS computedStyle("r", "auto") is "0px"
+PASS computedStyle("r", "100 px") is "0px"
+PASS computedStyle("r", "100px;") is "0px"
+PASS computedStyle("r", "100px !important") is "0px"
+PASS computedStyle("r", "{ 100px }") is "0px"
+PASS computedStyle("rx", "auto") is "0px"
+PASS computedStyle("rx", "100 px") is "0px"
+PASS computedStyle("rx", "100px;") is "0px"
+PASS computedStyle("rx", "100px !important") is "0px"
+PASS computedStyle("rx", "{ 100px }") is "0px"
+PASS computedStyle("ry", "auto") is "0px"
+PASS computedStyle("ry", "100 px") is "0px"
+PASS computedStyle("ry", "100px;") is "0px"
+PASS computedStyle("ry", "100px !important") is "0px"
+PASS computedStyle("ry", "{ 100px }") is "0px"
PASS computedStyle("width", "100 px") is "auto"
PASS computedStyle("width", "100px;") is "auto"
PASS computedStyle("width", "100px !important") is "auto"
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp (172646 => 172647)
--- trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp 2014-08-15 20:37:15 UTC (rev 172646)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp 2014-08-15 20:48:35 UTC (rev 172647)
@@ -88,7 +88,9 @@
}
ASSERT(isSVGEllipseElement(graphicsElement()));
- m_radii = FloatSize(lengthContext.valueForLength(style().svgStyle().rx()), lengthContext.valueForLength(style().svgStyle().ry()));
+ m_radii = FloatSize(
+ lengthContext.valueForLength(style().svgStyle().rx(), LengthModeWidth),
+ lengthContext.valueForLength(style().svgStyle().ry(), LengthModeHeight));
}
void RenderSVGEllipse::fillShape(GraphicsContext* context) const