From 37c237afc6da788f6dd6f551e611e47fcae6504f Mon Sep 17 00:00:00 2001
From: Bear Travis <betravis@adobe.com>
Date: Mon, 23 Sep 2013 17:11:55 -0700
Subject: [PATCH 1/3] Add parsing tests for basic shapes for CSS Shapes
 Specification

---
 .../basic-shapes/resources/parsing-utils.js   | 43 ++++++++++++++++
 .../shape-outside-circle-000.html             | 25 ++++++++++
 .../shape-outside-circle-001.html             | 22 ++++++++
 .../shape-outside-computed-circle-000.html    | 25 ++++++++++
 ...-outside-computed-inset-rectangle-000.html | 23 +++++++++
 .../shape-outside-computed-rectangle-000.html | 23 +++++++++
 .../shape-outside-computed-shape-000.html     | 50 +++++++++++++++++++
 .../shape-outside-computed-shape-001.html     | 32 ++++++++++++
 .../shape-outside-computed-shape-002.html     | 49 ++++++++++++++++++
 .../shape-outside-ellipse-000.html            | 25 ++++++++++
 .../shape-outside-ellipse-001.html            | 23 +++++++++
 .../shape-outside-inset-rectangle-000.html    | 29 +++++++++++
 .../shape-outside-inset-rectangle-001.html    | 27 ++++++++++
 .../shape-outside-polygon-000.html            | 29 +++++++++++
 .../shape-outside-rectangle-000.html          | 29 +++++++++++
 .../shape-outside-rectangle-001.html          | 25 ++++++++++
 .../shape-outside-shape-arguments-000.html    | 30 +++++++++++
 .../shape-outside-shape-arguments-001.html    | 25 ++++++++++
 .../shape-outside-shape-notation-000.html     | 26 ++++++++++
 19 files changed, 560 insertions(+)
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/resources/parsing-utils.js
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-001.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-inset-rectangle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-rectangle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-001.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-001.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-001.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-001.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-notation-000.html

diff --git a/contributors/adobe/submitted/shapes/basic-shapes/resources/parsing-utils.js b/contributors/adobe/submitted/shapes/basic-shapes/resources/parsing-utils.js
new file mode 100644
index 0000000000..9b41de159f
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/resources/parsing-utils.js
@@ -0,0 +1,43 @@
+function test_inline_style(value, expected) {
+    var div = document.createElement('div');
+    div.style.setProperty('shape-outside', value);
+    var actual = div.style.getPropertyValue('shape-outside');
+    assert_equals(actual, typeof expected !== 'undefined' ? expected : value);
+}
+
+function test_computed_style(value, expected, props) {
+    var div = document.createElement('div');
+    div.style.setProperty('shape-outside', value);
+    if (props)
+        for (key in props)
+            div.style.setProperty(key, props[key]);
+    document.body.appendChild(div);
+    var style = getComputedStyle(div);
+    var actual = style.getPropertyValue('shape-outside');
+    document.body.removeChild(div);
+    assert_equals(actual, typeof expected !== 'undefined' ? expected : value);
+}
+
+function test_approx_computed_style(value, expected, props) {
+    var div = document.createElement('div');
+    div.style.setProperty('shape-outside', value);
+    if (props)
+        for (key in props)
+            div.style.setProperty(key, props[key]);
+    document.body.appendChild(div);
+    var numre = /[\d\.]+/g;
+
+    var result = getComputedStyle(div).getPropertyValue('shape-outside');
+    document.body.removeChild(div);
+
+    // Is it the same except for the numbers?
+    assert_equals(result.replace(numre, ''), expected.replace(numre, ''));
+
+    // Are the numbers equal?
+    var results = result.match(numre).map(parseFloat);
+    var expecteds = expected.match(numre).map(parseFloat);
+    assert_equals(results.length, expecteds.length);
+    results.forEach(function(result, i) {
+        assert_approx_equals(result, expecteds[i], 0.01);
+    });
+}
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-000.html
new file mode 100644
index 0000000000..550d7edb22
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-000.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Circle Inline Style Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#circle">
+        <meta name="assert" content="A circular basic shape has 3 length or percentage arguments">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["3 length arguments", "circle(1px, 2px, 3px)"],
+                ["3 percentage arguments", "circle(1%, 2%, 3%)"],
+                ["Too few arguments", "circle(1px, 2px)", null],
+                ["Too many arguments", "circle(1px, 2px, 3px, 4px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-001.html
new file mode 100644
index 0000000000..8ae2d49afd
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-circle-001.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Circle Invalid Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#circle">
+        <meta name="assert" content="A circular basic shape's radius cannot be negative">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["Invalid r", "circle(1px, 2px, -3px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html
new file mode 100644
index 0000000000..7b72c15cae
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Circle Percentage Lengths</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#circle">
+        <meta name="assert" content="Computed circle has used lengths, where percentage r is resolved against sqrt((width ^ 2 + height ^ 2) / 2)">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_approx_computed_style, [
+                ['width == height', 'circle(50%, 50%, 50%)', 'circle(50px, 50px, 50px)', { 'width' : '100px', 'height' : '100px' } ],
+                ['height > width', 'circle(50%, 50%, 50%', 'circle(50px, 100px, 158.11388px)', { 'width' : '100px', 'height' : '200px'} ],
+                ['width auto', 'circle(50%, 50%, 50%)', 'circle(0px, 50px, 70.711px)', { 'width' : 'auto', 'display' : 'inline-block', 'height' : '100px' }],
+                ['height auto', 'circle(50%, 50%, 50%)', 'circle(50px, 0px, 70.711px)', { 'width' : '100px', 'height' : 'auto' }]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-inset-rectangle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-inset-rectangle-000.html
new file mode 100644
index 0000000000..3b661071cc
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-inset-rectangle-000.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Inset Rectangle Computed Style</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#inset-rectangle">
+        <meta name="assert" content="If rx is absent, it defaults to 0. If ry is missing, it defaults to rx.">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_computed_style, [
+                ["rx, ry both missing", "inset-rectangle(1px, 2px, 3px, 4px)", "inset-rectangle(1px, 2px, 3px, 4px, 0px, 0px)"],
+                ["ry missing", "inset-rectangle(1px, 2px, 3px, 4px, 5px)", "inset-rectangle(1px, 2px, 3px, 4px, 5px, 5px)"]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-rectangle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-rectangle-000.html
new file mode 100644
index 0000000000..78925bc0b6
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-rectangle-000.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Rectangle Computed Style</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#rectangle">
+        <meta name="assert" content="If rx is not present, it defaults to 0. If ry is not present, it defaults to rx.">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_computed_style, [
+                ["rx, ry both missing", "rectangle(1px, 2px, 3px, 4px)", "rectangle(1px, 2px, 3px, 4px, 0px, 0px)"],
+                ["ry missing", "rectangle(1px, 2px, 3px, 4px, 5px)", "rectangle(1px, 2px, 3px, 4px, 5px, 5px)"]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html
new file mode 100644
index 0000000000..0336e66c83
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Basic Shape Computed Relative Lengths</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#shape-outside-property">
+        <meta name="assert" content="The basic shape can contain relative length formats, which compute to the used length value">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            // relative units: em, ex, ch, rem, vw, vh, vmin, vmax
+            var units = ['em', 'ex', 'ch', 'rem', 'vw', 'vh', 'vmin', 'vmax'];
+            var div = document.createElement('div');
+            document.body.appendChild(div);
+            var resolveds = {};
+            units.forEach(function(unit) {
+                div.style.fontSize = '1' + unit;
+                var s = getComputedStyle(div);
+                resolveds[unit] = parseFloat(s.fontSize);
+            });
+            document.body.removeChild(div);
+
+            function fillArray(string, length) {
+                return Array.apply(null, new Array(length)).map(String.prototype.valueOf, string);
+            }
+
+            function testUnit(unit) {
+                var relativeLength = '1' + unit;
+                var usedLength = resolveds[unit] + 'px';
+
+                var input = 'circle(' + fillArray('1' + unit, 3).join(', ') + ')';
+                var output = 'circle(' + fillArray(resolveds[unit] + 'px', 3).join(', ') + ')';
+
+                test_computed_style(input, output);
+            }
+
+            var tests = units.map(function(unit) {
+                return [unit + ' units', unit];
+            });
+
+            generate_tests(testUnit, tests);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html
new file mode 100644
index 0000000000..721796ea82
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Percentages are Resolved in Computed Value</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
+        <meta name="assert" content="The basic shape can contain percentage lengths, which compute to the used length value">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_computed_style, [
+                [
+                "Rectangle percentages resolved", "rectangle(10%, 20%, 30%, 40%, 50%, 60%)", "rectangle(10px, 40px, 30px, 80px, 50px, 120px)", { "width" : "100px", "height" : "200px" }
+                ],[
+                "Inset rectangle percentages are resolved", "inset-rectangle(10%, 20%, 30%, 40%, 50%, 60%)", "inset-rectangle(10px, 40px, 30px, 80px, 50px, 120px", { "width" : "100px", "height" : "200px" }
+                ],[
+                "Circle percentages are resolved", "circle(50%, 50%, 50%)", "circle(50px, 50px, 50px)", { "width" : "100px", "height" : "100px" }
+                ],[
+                "Ellipse percentages are resolved", "ellipse(10%, 20%, 30%, 40%)", "ellipse(10px, 40px, 30px, 80px", { "width" : "100px", "height" : "200px" }
+                ],[
+                "Polygon percentages are resolved", "polygon(10% 20%, 30% 40%, 50% 60%)", "polygon(10px 40px, 30px 80px, 50px 120px)"
+                ]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html
new file mode 100644
index 0000000000..093cd49682
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Basic Shape Computed Relative to Box Sizing</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
+        <meta name="assert" content="The basic shape can contain percentage lengths, which are resolved relative to the box-sizing property, which compute to the used length value">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_computed_style, [[
+                'box-sizing: border-box includes border',
+                'rectangle(10%, 20%, 30%, 40%, 50%, 60%)',
+                'circle(10px, 40px, 30px, 80px, 50px, 120px)',
+                {
+                    'width' : '50px',
+                    'height' : '100px',
+                    'box-sizing' : 'border-box',
+                    'border' : '50px solid transparent'
+                }], [
+                'box-sizing: border-box includes padding',
+                'rectangle(10%, 20%, 30%, 40%, 50%, 60%)',
+                'circle(10px, 40px, 30px, 80px, 50px, 120px)',
+                {
+                    'width' : '50px',
+                    'height' : '100px',
+                    'box-sizing' : 'border-box',
+                    'padding' : '25px'
+                }], [
+                'box-sizing: border-box includes border + padding',
+                'rectangle(10%, 20%, 30%, 40%, 50%, 60%)',
+                'circle(10px, 40px, 30px, 80px, 50px, 120px)',
+                {
+                    'width' : '50px',
+                    'height' : '100px',
+                    'box-sizing' : 'border-box',
+                    'border' : '25px solid transparent',
+                    'padding' : '25px'
+                }
+                ]]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-000.html
new file mode 100644
index 0000000000..c252f00e8b
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-000.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Circle Inline Style Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#ellipse">
+        <meta name="assert" content="An elliptical basic shape has 4 length or percentage arguments">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["4 length arguments", "ellipse(1px, 2px, 3px, 4px)"],
+                ["4 percentage arguments", "ellipse(1%, 2%, 3%, 4%)"],
+                ["Too few arguments", "ellipse(1px, 2px, 3px)", null],
+                ["Too many arguments", "ellipse(1px, 2px, 3px, 4px, 5px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-001.html
new file mode 100644
index 0000000000..744e823e72
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-ellipse-001.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Circle Invalid Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#ellipse">
+        <meta name="assert" content="An elliptical basic shape's rx and ry values cannot be negative">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["Invalid rx", "ellipse(1px, 2px, -3px, 4px)", null],
+                ["Invalid ry", "ellipse(1px, 2px, 3px, -5px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-000.html
new file mode 100644
index 0000000000..4a959547fa
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-000.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Inset Rectangle Inline Style Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#inset-rectangle">
+        <meta name="assert" content="An inset-rectangle basic shape has 4-6 length or percentage arguments">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["4 length arguments", "inset-rectangle(1px, 2px, 3px, 4px)"],
+                ["5 length arguments", "inset-rectangle(1px, 2px, 3px, 4px, 5px)"],
+                ["6 length arguments", "inset-rectangle(1px, 2px, 3px, 4px, 5px, 6px)"],
+                ["4 percentage arguments", "inset-rectangle(1%, 2%, 3%, 4%)"],
+                ["5 percentage arguments", "inset-rectangle(1%, 2%, 3%, 4%, 5%)"],
+                ["6 percentage arguments", "inset-rectangle(1%, 2%, 3%, 4%, 5%, 6%)"],
+                ["Too few arguments", "inset-rectangle(1px, 2px, 3px)", null],
+                ["Too many arguments", "inset-rectangle(1px, 2px, 3px, 4px, 5px, 6px, 7px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-001.html
new file mode 100644
index 0000000000..1a299ac748
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-inset-rectangle-001.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Inset Rectangle Invalid Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#inset-rectangle">
+        <meta name="assert" content="No argument to inset-rectangle can be negative">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["Invalid top", "inset-rectangle(-1px, 2px, 3px, 4px)", null],
+                ["Invalid right", "inset-rectangle(1px, -2px, 3px, 4px)", null],
+                ["Invalid bottom", "rectangle(1px, 2px, -3px, 4px)", null],
+                ["Invalid left", "rectangle(1px, 2px, 3px, -4px)", null],
+                ["Invalid rx", "rectangle(1px, 2px, 3px, 4px, -5px, 6px)", null],
+                ["Invalid ry", "rectangle(1px, 2px, 3px, 4px, 5px, -6px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html
new file mode 100644
index 0000000000..50b6bf04e2
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Polygon Inline Style Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#polygon">
+        <meta name="assert" content="A polygonal basic shape has an optional fill-rule and one or more pairs of coordinates">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["Too few points", "polygon()", null],
+                ["Clip-rule only is invalid", "polygon(evenodd)", null],
+                ["1 point only", "polyon(1px 2px)"],
+                ["Clip rule and point", "polygon(evenodd, 1px 2px)"],
+                ["Clip rule and multiple points", "polygon(nonzero, 1px 2px, 3px 4px)"],
+                ["Clip rule and multiple percentages", "polygon(evenodd, 1% 2%, 3% 4%)"],
+                ["No coordinates are paired", "polygon(1px, 2px, 3px, 4px)", null],
+                ["Not all coordinates are paired", "polygon(1px 2px, 3px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-000.html
new file mode 100644
index 0000000000..0c7adae454
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-000.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Rectangle Inline Style Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#rectangle">
+        <meta name="assert" content="A rectangular basic shape has 4-6 arguments">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["4 length arguments", "rectangle(1px, 2px, 3px, 4px)"],
+                ["5 length arguments", "rectangle(1px, 2px, 3px, 4px, 5px)"],
+                ["6 length arguments", "rectangle(1px, 2px, 3px, 4px, 5px, 6px)"],
+                ["4 percentage arguments", "rectangle(1%, 2%, 3%, 4%)"],
+                ["5 percentage arguments", "rectangle(1%, 2%, 3%, 4%, 5%)"],
+                ["6 percentage arguments", "rectangle(1%, 2%, 3%, 4%, 5%, 6%)"],
+                ["Too few arguments", "rectangle(1px, 2px, 3px)", null],
+                ["Too many arguments", "rectangle(1px, 2px, 3px, 4px, 5px, 6px, 7px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-001.html
new file mode 100644
index 0000000000..61dee6ad24
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-rectangle-001.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Rectangle Invalid Arguments</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#rectangle">
+        <meta name="assert" content="A rectangular basic shape cannot have negative width, height, rx, or ry">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["Invalid width", "rectangle(1px, 2px, -3px, 4px)", null],
+                ["Invalid height", "rectangle(1px, 2px, 3px, -4px)", null],
+                ["Invalid rx", "rectangle(1px, 2px, 3px, 4px, -5px, 6px)", null],
+                ["Invalid ry", "rectangle(1px, 2px, 3px, 4px, 5px, -6px)", null]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-000.html
new file mode 100644
index 0000000000..e835c0d812
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-000.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Basic Shape Computed Relative Lengths</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
+        <meta name="assert" content="A basic basic shape can contain all unit types">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            // relative units: em, ex, ch, rem, vw, vh, vmin, vmax
+            // fixed units: cm, mm, in, px, pt, pc
+            // percentage unit: %
+            // zero length: 0
+            generate_tests(test_inline_style, [
+                ["0-valued", "rectangle(0, 0, 0, 0)", "rectangle(0px, 0px, 0px, 0px)"],
+                ["Font relative units", "rectangle(1em, 2ex, 3ch, 4rem)"],
+                ["View relative units", "rectangle(1vw, 2vh, 3vmin, 4vmax)"],
+                ["Fixed units", "rectangle(1cm, 2mm, 3in, 4px, 5pt, 6pc)"],
+                ["Percentage units", "rectangle(1%, 2%, 3%, 4%, 5%, 6%)"],
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-001.html
new file mode 100644
index 0000000000..29fe67c714
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-arguments-001.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Shape Inline Style Number Values</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
+        <meta name="assert" content="The basic shape can contain all valid number formats">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            // number forms: d, +d, -d, .d, +.d, -.d, d.d, +d.d, -d.d
+            generate_tests(test_inline_style, [
+                ["Positive number variations" , "rectangle(1px, +2px, .3px, +.4px, 5.5px, +6.6px)", "rectangle(1px, 2px, 0.3px, 0.4px, 5.5px, 6.6px)"],
+                ["Negative number variations 1", "rectangle(-1px, -.2px, 0px, 0px)", "rectangle(-1px, -0.2px, 0px, 0px)"],
+                ["Negative number variations 2", "rectangle(-1.1px, 0px, 0px, 0px)"]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-notation-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-notation-000.html
new file mode 100644
index 0000000000..1196cfd2d8
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-shape-notation-000.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Basic Shape Inline Style Functional Notation</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
+        <meta name="assert" content="Basic shapes use functional notation, and may contain optional whitespace">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_inline_style, [
+                ["No whitespace" , "rectangle(1px,2px,3px,4px)", "rectangle(1px, 2px, 3px, 4px)"],
+                ["Extra whitespace", "rectangle(  1px,\
+                    2px,  3px,    4px)", "rectangle(1px, 2px, 3px, 4px)"],
+                ["Invalid leading whitespace", "rectangle (1px, 2px, 3px, 4px)", null],
+                ["No commas", "rectangle(1px 2px 3px 4px)", null]
+            ]);
+        </script>
+    </body>
+</html>

From e862d6a9834cf7d8d229f33ffc56f0072e6e29b4 Mon Sep 17 00:00:00 2001
From: Bear Travis <betravis@adobe.com>
Date: Fri, 27 Sep 2013 12:05:17 -0700
Subject: [PATCH 2/3] Fixing computed shapes tests to check for computed, not
 used, values

---
 .../shape-outside-computed-circle-000.html    | 25 ---------
 .../shape-outside-computed-polygon-000.html   | 22 ++++++++
 .../shape-outside-computed-shape-000.html     | 13 ++---
 .../shape-outside-computed-shape-001.html     | 51 +++++++++++++------
 .../shape-outside-computed-shape-002.html     | 46 +++++------------
 5 files changed, 78 insertions(+), 79 deletions(-)
 delete mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html
 create mode 100644 contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-polygon-000.html

diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html
deleted file mode 100644
index 7b72c15cae..0000000000
--- a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-circle-000.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Shape Outside Circle Percentage Lengths</title>
-        <link rel="author" title="Adobe" href="http://html.adobe.com/">
-        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
-        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#circle">
-        <meta name="assert" content="Computed circle has used lengths, where percentage r is resolved against sqrt((width ^ 2 + height ^ 2) / 2)">
-        <meta name="flags" content="DOM">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <script src="resources/parsing-utils.js"></script>
-    </head>
-    <body>
-        <div id="log"></div>
-        <script type="text/javascript">
-            generate_tests(test_approx_computed_style, [
-                ['width == height', 'circle(50%, 50%, 50%)', 'circle(50px, 50px, 50px)', { 'width' : '100px', 'height' : '100px' } ],
-                ['height > width', 'circle(50%, 50%, 50%', 'circle(50px, 100px, 158.11388px)', { 'width' : '100px', 'height' : '200px'} ],
-                ['width auto', 'circle(50%, 50%, 50%)', 'circle(0px, 50px, 70.711px)', { 'width' : 'auto', 'display' : 'inline-block', 'height' : '100px' }],
-                ['height auto', 'circle(50%, 50%, 50%)', 'circle(50px, 0px, 70.711px)', { 'width' : '100px', 'height' : 'auto' }]
-            ]);
-        </script>
-    </body>
-</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-polygon-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-polygon-000.html
new file mode 100644
index 0000000000..d617bde154
--- /dev/null
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-polygon-000.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Shape Outside Polygon Computed Style</title>
+        <link rel="author" title="Adobe" href="http://html.adobe.com/">
+        <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#polygon">
+        <meta name="assert" content="The default winding rule is nonzero.">
+        <meta name="flags" content="DOM">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="resources/parsing-utils.js"></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <script type="text/javascript">
+            generate_tests(test_computed_style, [
+                ["winding rule missing", "polygon(10% 20%, 30% 40%, 50% 60%)", "polygon(nonzero, 10% 20%, 30% 40%, 50% 60%)"]
+            ]);
+        </script>
+    </body>
+</html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html
index 0336e66c83..39e46f0349 100644
--- a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-000.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Shape Outside Basic Shape Computed Relative Lengths</title>
+        <title>Shape Outside Basic Shape Computed Font Relative Lengths</title>
         <link rel="author" title="Adobe" href="http://html.adobe.com/">
         <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
         <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#shape-outside-property">
-        <meta name="assert" content="The basic shape can contain relative length formats, which compute to the used length value">
+        <link rel="help" href="http://dev.w3.org/csswg/css-cascade/#computed">
+        <meta name="assert" content="The basic shape can contain relative length formats, which resolve to the computed (absolute) length value">
         <meta name="flags" content="DOM">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
@@ -14,15 +15,15 @@
     <body>
         <div id="log"></div>
         <script type="text/javascript">
-            // relative units: em, ex, ch, rem, vw, vh, vmin, vmax
-            var units = ['em', 'ex', 'ch', 'rem', 'vw', 'vh', 'vmin', 'vmax'];
+            // font relative units: em, ex, ch, rem
+            var units = ['em', 'ex', 'ch', 'rem'];
             var div = document.createElement('div');
             document.body.appendChild(div);
             var resolveds = {};
             units.forEach(function(unit) {
-                div.style.fontSize = '1' + unit;
+                div.style.width = '1' + unit;
                 var s = getComputedStyle(div);
-                resolveds[unit] = parseFloat(s.fontSize);
+                resolveds[unit] = parseFloat(s.width);
             });
             document.body.removeChild(div);
 
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html
index 721796ea82..beb27b4676 100644
--- a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-001.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Shape Outside Percentages are Resolved in Computed Value</title>
+        <title>Shape Outside Basic Shape Computed Viewport Relative Lengths</title>
         <link rel="author" title="Adobe" href="http://html.adobe.com/">
         <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
-        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
-        <meta name="assert" content="The basic shape can contain percentage lengths, which compute to the used length value">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#shape-outside-property">
+        <link rel="help" href="http://dev.w3.org/csswg/css-cascade/#computed">
+        <meta name="assert" content="The basic shape can contain relative length formats, which resolve to the computed (absolute) length value">
         <meta name="flags" content="DOM">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
@@ -14,19 +15,37 @@
     <body>
         <div id="log"></div>
         <script type="text/javascript">
-            generate_tests(test_computed_style, [
-                [
-                "Rectangle percentages resolved", "rectangle(10%, 20%, 30%, 40%, 50%, 60%)", "rectangle(10px, 40px, 30px, 80px, 50px, 120px)", { "width" : "100px", "height" : "200px" }
-                ],[
-                "Inset rectangle percentages are resolved", "inset-rectangle(10%, 20%, 30%, 40%, 50%, 60%)", "inset-rectangle(10px, 40px, 30px, 80px, 50px, 120px", { "width" : "100px", "height" : "200px" }
-                ],[
-                "Circle percentages are resolved", "circle(50%, 50%, 50%)", "circle(50px, 50px, 50px)", { "width" : "100px", "height" : "100px" }
-                ],[
-                "Ellipse percentages are resolved", "ellipse(10%, 20%, 30%, 40%)", "ellipse(10px, 40px, 30px, 80px", { "width" : "100px", "height" : "200px" }
-                ],[
-                "Polygon percentages are resolved", "polygon(10% 20%, 30% 40%, 50% 60%)", "polygon(10px 40px, 30px 80px, 50px 120px)"
-                ]
-            ]);
+            // viewport relative units: vw, vh, vmin, vmax
+            var units = ['vw', 'vh', 'vmin', 'vmax'];
+            var div = document.createElement('div');
+            document.body.appendChild(div);
+            var resolveds = {};
+            units.forEach(function(unit) {
+                div.style.width = '1' + unit;
+                var s = getComputedStyle(div);
+                resolveds[unit] = parseFloat(s.width);
+            });
+            document.body.removeChild(div);
+
+            function fillArray(string, length) {
+                return Array.apply(null, new Array(length)).map(String.prototype.valueOf, string);
+            }
+
+            function testUnit(unit) {
+                var relativeLength = '1' + unit;
+                var usedLength = resolveds[unit] + 'px';
+
+                var input = 'circle(' + fillArray('1' + unit, 3).join(', ') + ')';
+                var output = 'circle(' + fillArray(resolveds[unit] + 'px', 3).join(', ') + ')';
+
+                test_computed_style(input, output);
+            }
+
+            var tests = units.map(function(unit) {
+                return [unit + ' units', unit];
+            });
+
+            generate_tests(testUnit, tests);
         </script>
     </body>
 </html>
diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html
index 093cd49682..e455e7e9a4 100644
--- a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-computed-shape-002.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Shape Outside Basic Shape Computed Relative to Box Sizing</title>
+        <title>Shape Outside Basic Shape Computed Percentage Lengths</title>
         <link rel="author" title="Adobe" href="http://html.adobe.com/">
         <link rel="author" title="Bear Travis" href="mailto:betravis@adobe.com">
-        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#basic-shapes-from-svg-syntax">
-        <meta name="assert" content="The basic shape can contain percentage lengths, which are resolved relative to the box-sizing property, which compute to the used length value">
+        <link rel="help" href="http://dev.w3.org/csswg/css-shapes/#shape-outside-property">
+        <link rel="help" href="http://dev.w3.org/csswg/css-cascade/#computed">
+        <meta name="assert" content="The basic shape can contain percentages, which remain unchanged when computed">
         <meta name="flags" content="DOM">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
@@ -15,35 +16,16 @@
         <div id="log"></div>
         <script type="text/javascript">
             generate_tests(test_computed_style, [[
-                'box-sizing: border-box includes border',
-                'rectangle(10%, 20%, 30%, 40%, 50%, 60%)',
-                'circle(10px, 40px, 30px, 80px, 50px, 120px)',
-                {
-                    'width' : '50px',
-                    'height' : '100px',
-                    'box-sizing' : 'border-box',
-                    'border' : '50px solid transparent'
-                }], [
-                'box-sizing: border-box includes padding',
-                'rectangle(10%, 20%, 30%, 40%, 50%, 60%)',
-                'circle(10px, 40px, 30px, 80px, 50px, 120px)',
-                {
-                    'width' : '50px',
-                    'height' : '100px',
-                    'box-sizing' : 'border-box',
-                    'padding' : '25px'
-                }], [
-                'box-sizing: border-box includes border + padding',
-                'rectangle(10%, 20%, 30%, 40%, 50%, 60%)',
-                'circle(10px, 40px, 30px, 80px, 50px, 120px)',
-                {
-                    'width' : '50px',
-                    'height' : '100px',
-                    'box-sizing' : 'border-box',
-                    'border' : '25px solid transparent',
-                    'padding' : '25px'
-                }
-                ]]);
+                "rectangle", "rectangle(10%, 20%, 30%, 40%, 50%, 60%)"
+            ], [
+                "inset-rectangle", "inset-rectangle(10%, 20%, 30%, 40%, 50%, 60%)"
+            ], [
+                "circle", "circle(10%, 20%, 30%)"
+            ], [
+                "ellipse", "ellipse(10%, 20%, 30%, 40%)"
+            ], [
+                "polygon", "polygon(nonzero, 10% 20%, 30% 40%, 50% 60%)"
+            ]]);
         </script>
     </body>
 </html>

From a0be78da86ee369f934d224c580ad87537cfaf1a Mon Sep 17 00:00:00 2001
From: Bear Travis <betravis@adobe.com>
Date: Mon, 30 Sep 2013 14:17:28 -0700
Subject: [PATCH 3/3] Fixing shape name typo in polygon test

---
 .../shapes/basic-shapes/shape-outside-polygon-000.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html
index 50b6bf04e2..682c7a4f1f 100644
--- a/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html
+++ b/contributors/adobe/submitted/shapes/basic-shapes/shape-outside-polygon-000.html
@@ -17,7 +17,7 @@
             generate_tests(test_inline_style, [
                 ["Too few points", "polygon()", null],
                 ["Clip-rule only is invalid", "polygon(evenodd)", null],
-                ["1 point only", "polyon(1px 2px)"],
+                ["1 point only", "polygon(1px 2px)"],
                 ["Clip rule and point", "polygon(evenodd, 1px 2px)"],
                 ["Clip rule and multiple points", "polygon(nonzero, 1px 2px, 3px 4px)"],
                 ["Clip rule and multiple percentages", "polygon(evenodd, 1% 2%, 3% 4%)"],