Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/svg/dom/SVGLength-calc-in-attr.html

Issue 2097383002: Added support of calc() for SVGLength (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/svg-attribute-interpolation/svg-calc-interpolation.html ('k') | third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp » ('j') | third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/svg/dom/SVGLength-calc-in-attr.html
diff --git a/third_party/WebKit/LayoutTests/svg/dom/SVGLength-calc-in-attr.html b/third_party/WebKit/LayoutTests/svg/dom/SVGLength-calc-in-attr.html
new file mode 100644
index 0000000000000000000000000000000000000000..96846d5f1804c4863a2d1eae826997c22ff5404f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/svg/dom/SVGLength-calc-in-attr.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<svg width="500px" height="500px" viewBox="0 0 500 500">
+ <rect width="1" height="1"/>
+ <marker markerWidth="1" markerHeight="1"/>
+</svg>
+<script>
+var viewportWidth = 500;
+var EPSILON = Math.pow(2, -8);
+var cssPixelsPerInch = 96;
+var cssPixelsPerCentimeter = cssPixelsPerInch / 2.54; //2.54 cm/in
+var cssPixelsPerMillimeter = cssPixelsPerCentimeter / 10;
+var cssPixelsPerPoint = cssPixelsPerInch / 72;
+var cssPixelsPerPica = cssPixelsPerInch / 6;
+
+function viewportWidthPercent()
+{
fs 2016/07/16 21:13:02 Move to previous line
Shanmuga Pandi 2016/07/18 13:35:32 Done.
+ return viewportWidth / 100;
+}
+
+function assert_calc_expression_on_width_attr(expression, expected) {
+ var rect = document.querySelector('rect');
+ var rectWidth;
+ // Test calc with setAttribute
+ rect.setAttribute('width', expression);
+ rectWidth = rect.getBoundingClientRect().width;
+ assert_approx_equals(rectWidth, expected, EPSILON);
+ assert_approx_equals(rect.width.baseVal.value, expected, EPSILON);
+ assert_equals(rect.width.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_UNKNOWN);
+ assert_equals(rect.width.baseVal.valueInSpecifiedUnits, 0);
+
+ // Test valueInSpecifiedUnits setter after 'calc' value attribute
+ rect.width.baseVal.valueInSpecifiedUnits = 100;
+ assert_equals(rect.width.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_NUMBER);
+ assert_equals(rect.width.baseVal.valueInSpecifiedUnits, 100);
+
+ // Test value setter after 'calc' value attribute
+ rect.setAttribute('width', expression); // reset to calc value
+ rect.width.baseVal.value = 10;
+ assert_equals(rect.width.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_NUMBER);
+ assert_equals(rect.width.baseVal.valueInSpecifiedUnits, 10);
+
+ // Test calc with "valueAsString"
+ rect.setAttribute('width', '20px'); // reset to normal value
+ assert_throws(null, function() {rect.width.baseVal.valueAsString = expression});
+ assert_equals(rect.width.baseVal.value, 20);
+}
+
+function assert_calc_expression_on_markerWidth_attr(expression, expected) {
+ var marker = document.querySelector('marker');
+ // Test calc with setAttribute
+ marker.setAttribute('markerWidth', expression);
+ assert_approx_equals(marker.markerWidth.baseVal.value, expected, EPSILON);
+ assert_equals(marker.markerWidth.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_UNKNOWN);
+ assert_equals(marker.markerWidth.baseVal.valueInSpecifiedUnits, 0);
+
+ // Test valueInSpecifiedUnits setter after 'calc' value attribute
+ marker.markerWidth.baseVal.valueInSpecifiedUnits = 100;
+ assert_equals(marker.markerWidth.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_NUMBER);
+ assert_equals(marker.markerWidth.baseVal.valueInSpecifiedUnits, 100);
+
+ // Test value setter after 'calc' value attribute
+ marker.setAttribute('width', expression); // reset to calc value
fs 2016/07/16 21:13:02 s/'width'/'markerWidth'/
Shanmuga Pandi 2016/07/18 13:35:32 Done.
+ marker.markerWidth.baseVal.value = 10;
+ assert_equals(marker.markerWidth.baseVal.unitType, SVGLength.SVG_LENGTHTYPE_NUMBER);
+ assert_equals(marker.markerWidth.baseVal.valueInSpecifiedUnits, 10);
+
+ // Test calc with "valueAsString"
+ marker.setAttribute('markerWidth', '20px'); // reset to normal value
+ assert_throws(null, function() {marker.markerWidth.baseVal.valueAsString = expression});
+ assert_equals(marker.markerWidth.baseVal.value, 20);
+}
+
+function assert_calc_expression(expression, expected) {
+ assert_calc_expression_on_width_attr(expression, expected); // presentation attr
+ assert_calc_expression_on_markerWidth_attr(expression, expected); // non presentation attr
+}
+
+test(function() {
+ assert_calc_expression("calc(20%)", (20 * viewportWidthPercent()));
+ assert_calc_expression("calc(10mm + 10in)", (10 * cssPixelsPerMillimeter) + (10 * cssPixelsPerInch));
+ assert_calc_expression("calc(10mm + 10mm)", (20 * cssPixelsPerMillimeter));
+ assert_calc_expression("calc(20mm)", (20 * cssPixelsPerMillimeter));
+ assert_calc_expression("calc(10 + 10)", 20);
+ assert_calc_expression("calc(10mm + 10)", (10 * cssPixelsPerMillimeter) + 10);
+ assert_calc_expression("calc(10% + 10)", (10 * viewportWidthPercent()) + 10);
+ assert_calc_expression("calc(1cm + 2in + 1cm + 2)", (2 * cssPixelsPerInch) + (2 * cssPixelsPerCentimeter) + 2);
+ assert_calc_expression("calc(1cm + 2 + 1cm + 2in)", (2 * cssPixelsPerInch) + (2 * cssPixelsPerCentimeter) + 2);
+ assert_calc_expression("calc(10% + 10 + 2% + 10pc)", (12 * viewportWidthPercent()) + 10 + (10 * cssPixelsPerPica));
+}, "Tests calc() on presentation attr in svgLength");
fs 2016/07/16 21:13:01 This is a bit misleading since it also tests the n
Shanmuga Pandi 2016/07/18 13:35:32 Done.
+</script>
« no previous file with comments | « third_party/WebKit/LayoutTests/animations/svg-attribute-interpolation/svg-calc-interpolation.html ('k') | third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp » ('j') | third_party/WebKit/Source/core/animation/SVGLengthInterpolationType.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698