From 572066ed23a03e1058f0786169dd956bb6500f03 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Wed, 16 Jan 2013 14:17:44 +1100 Subject: [PATCH] Bug 826582 - Part 4: Make upstreamed calc() tests conform to the test template. r=dbaron --- .../values3/calc-background-position-1-ref.html | 13 +++++++++++-- .../values3/calc-background-position-1.html | 13 +++++++++++-- .../values3/calc-background-size-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-background-size-1.html | 13 +++++++++++-- .../submitted/values3/calc-border-radius-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-border-radius-1.html | 13 +++++++++++-- .../submitted/values3/calc-height-block-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-height-block-1.html | 13 +++++++++++-- .../submitted/values3/calc-height-table-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-height-table-1.html | 13 +++++++++++-- .../submitted/values3/calc-margin-block-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-margin-block-1.html | 13 +++++++++++-- .../values3/calc-max-height-block-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-max-height-block-1.html | 13 +++++++++++-- .../submitted/values3/calc-max-width-block-1.html | 13 +++++++++++-- .../calc-max-width-block-intrinsic-1-ref.html | 13 +++++++++++-- .../values3/calc-max-width-block-intrinsic-1.html | 13 +++++++++++-- .../submitted/values3/calc-min-height-block-1.html | 13 +++++++++++-- .../submitted/values3/calc-min-width-block-1.html | 13 +++++++++++-- .../calc-min-width-block-intrinsic-1-ref.html | 13 +++++++++++-- .../values3/calc-min-width-block-intrinsic-1.html | 13 +++++++++++-- .../values3/calc-offsets-absolute-bottom-1.html | 13 +++++++++++-- .../values3/calc-offsets-absolute-left-1.html | 13 +++++++++++-- .../values3/calc-offsets-absolute-right-1.html | 13 +++++++++++-- .../values3/calc-offsets-absolute-top-1-ref.html | 13 +++++++++++-- .../values3/calc-offsets-absolute-top-1.html | 13 +++++++++++-- .../values3/calc-offsets-relative-bottom-1.html | 13 +++++++++++-- .../values3/calc-offsets-relative-left-1-ref.html | 13 +++++++++++-- .../values3/calc-offsets-relative-left-1.html | 13 +++++++++++-- .../values3/calc-offsets-relative-right-1.html | 13 +++++++++++-- .../values3/calc-offsets-relative-top-1-ref.html | 13 +++++++++++-- .../values3/calc-offsets-relative-top-1.html | 13 +++++++++++-- .../submitted/values3/calc-padding-block-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-padding-block-1.html | 13 +++++++++++-- .../submitted/values3/calc-text-indent-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-text-indent-1.html | 13 +++++++++++-- .../values3/calc-text-indent-intrinsic-1-ref.html | 13 +++++++++++-- .../values3/calc-text-indent-intrinsic-1.html | 13 +++++++++++-- .../values3/calc-transform-origin-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-transform-origin-1.html | 13 +++++++++++-- .../values3/calc-vertical-align-1-ref.html | 9 ++++++++- .../submitted/values3/calc-vertical-align-1.html | 9 ++++++++- .../submitted/values3/calc-width-block-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-width-block-1.html | 13 +++++++++++-- .../values3/calc-width-block-intrinsic-1-ref.html | 13 +++++++++++-- .../values3/calc-width-block-intrinsic-1.html | 13 +++++++++++-- .../values3/calc-width-table-auto-1-ref.html | 9 ++++++++- .../submitted/values3/calc-width-table-auto-1.html | 9 ++++++++- .../values3/calc-width-table-fixed-1-ref.html | 13 +++++++++++-- .../submitted/values3/calc-width-table-fixed-1.html | 13 +++++++++++-- 50 files changed, 538 insertions(+), 96 deletions(-) diff --git a/layout/reftests/w3c-css/submitted/values3/calc-background-position-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-background-position-1-ref.html index 5f69e0c0de46..b801d36b7686 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-background-position-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-background-position-1-ref.html @@ -1,6 +1,11 @@ -Test for calc() on background-position - + +

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-background-position-1.html b/layout/reftests/w3c-css/submitted/values3/calc-background-position-1.html index c752f77c68dc..31e9cf97804a 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-background-position-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-background-position-1.html @@ -1,6 +1,11 @@ -Test for calc() on background-position - + +

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-background-size-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-background-size-1-ref.html index 6c09e1ea1edf..68a437f949c9 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-background-size-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-background-size-1-ref.html @@ -1,6 +1,11 @@ -Test for calc() on background-size - + +

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-background-size-1.html b/layout/reftests/w3c-css/submitted/values3/calc-background-size-1.html index 41e209e4898a..57d12aa4d596 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-background-size-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-background-size-1.html @@ -1,6 +1,11 @@ -Test for calc() on background-size - + +

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1-ref.html index e5de63e6c6ed..a2866c7456a6 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1-ref.html @@ -1,6 +1,11 @@ -test for border-radius: calc() - + +

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1.html b/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1.html index ff80c25578ce..d28dd59d9cae 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1.html @@ -1,6 +1,11 @@ -test for border-radius: calc() - + +

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-height-block-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-height-block-1-ref.html index 17fda45ab954..20e438a0909a 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-height-block-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-height-block-1-ref.html @@ -1,9 +1,16 @@ -Test for height:calc() or min-height:calc() on blocks - + +
@@ -20,3 +27,5 @@ body > div { float: left; width: 1px; background: blue; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-height-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-height-block-1.html index 669d3f9fbb51..613bce7a697c 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-height-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-height-block-1.html @@ -1,6 +1,11 @@ -Test for height:calc() on blocks - + +
@@ -24,3 +31,5 @@ body > div > div > div > div { height: 10px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-height-table-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-height-table-1-ref.html index 1eed5c98e557..9cb92ea63ede 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-height-table-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-height-table-1-ref.html @@ -1,12 +1,19 @@ -Test that height:calc() with no percentages has an effect on inner table elements - + + @@ -19,3 +26,5 @@ tbody, tr, td {
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-height-table-1.html b/layout/reftests/w3c-css/submitted/values3/calc-height-table-1.html index decb647925d0..ac0228b3c31c 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-height-table-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-height-table-1.html @@ -1,12 +1,19 @@ -Test that height:calc() with no percentages has an effect on inner table elements - + + @@ -19,3 +26,5 @@ tbody, tr, td {
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1-ref.html index 9e63796f402d..773bb51cd2ae 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1-ref.html @@ -1,14 +1,23 @@ -Test of margin-*: calc() - + +

paragraph with margin

paragraph with margin

paragraph with margin

paragraph with margin

paragraph with margin

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1.html index 93aa3a72b1b6..ba5bcc61256d 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1.html @@ -1,14 +1,23 @@ -Test of margin-*: calc() - + +

paragraph with margin

paragraph with margin

paragraph with margin

paragraph with margin

paragraph with margin

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1-ref.html index ca9384a72306..1357806577f4 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1-ref.html @@ -1,9 +1,16 @@ -Test for max-height:calc() on blocks - + +
@@ -20,3 +27,5 @@ body > div { float: left; width: 1px; background: blue; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1.html index dbfa41998cf1..610df8271242 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1.html @@ -1,6 +1,11 @@ -Test for max-height:calc() on blocks - + +
@@ -24,3 +31,5 @@ span { display: block; height: 300px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-1.html index 273ff67411fe..00322fd1072f 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-1.html @@ -1,11 +1,18 @@ -max-width: calc() on blocks - + +

50% - 3px

25% - 3px + 25%

@@ -14,3 +21,5 @@ p { background: green; color: white; margin: 1px 0; font-size: 10px; width: 1000

25% - 3px + 2*12.5%

25% - 3px + 2 * 12.5%

30% + 20%

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1-ref.html index 03ee37af0545..000127eeb801 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1-ref.html @@ -1,10 +1,17 @@ -intrinsic width of max-width: calc() on blocks - + +
@@ -12,3 +19,5 @@ body > div { margin: 0 0 1px 0; background: blue; color: white; height: 5px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1.html b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1.html index b8091de63153..de46d680668b 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1.html @@ -1,6 +1,11 @@ -intrinsic width of max-width: calc() on blocks - + +
@@ -16,3 +23,5 @@ body > div > div > div { width: 200px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-min-height-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-min-height-block-1.html index a9ef84d6a141..a643da415bc3 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-min-height-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-min-height-block-1.html @@ -1,6 +1,11 @@ -Test for min-height:calc() on blocks - + +
@@ -24,3 +31,5 @@ body > div > div > div > div { height: 10px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-1.html index 41c88754db22..e62ff6d94a21 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-1.html @@ -1,11 +1,18 @@ -min-width: calc() on blocks - + +

50% - 3px

25% - 3px + 25%

@@ -14,3 +21,5 @@ p { background: green; color: white; margin: 1px 0; font-size: 10px; width: 0 }

25% - 3px + 2*12.5%

25% - 3px + 2 * 12.5%

30% + 20%

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1-ref.html index f30d8406d8e4..39d50415d5d6 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1-ref.html @@ -1,10 +1,17 @@ -intrinsic width of min-width: calc() on blocks - + +
@@ -12,3 +19,5 @@ body > div { margin: 0 0 1px 0; background: blue; color: white; height: 5px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1.html b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1.html index 52649f26a58b..9677d7862e34 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1.html @@ -1,6 +1,11 @@ -intrinsic width of min-width: calc() on blocks - + +
@@ -16,3 +23,5 @@ body > div > div > div { width: 200px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-bottom-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-bottom-1.html index 3ab2d97f9d00..890db10b62fe 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-bottom-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-bottom-1.html @@ -1,11 +1,18 @@ -Test for bottom:calc() on absolutely positioned elements - + +
@@ -22,3 +29,5 @@ div.space { height: 100px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-left-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-left-1.html index 3c590f61c423..35a0ba296942 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-left-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-left-1.html @@ -1,10 +1,17 @@ -Test for left:calc() on absolutely positioned elements - + +
@@ -12,3 +19,5 @@ div[style] { background: blue; position: absolute; height: 3px; width: 100px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-right-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-right-1.html index e8daba484715..585d3b4742a9 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-right-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-right-1.html @@ -1,10 +1,17 @@ -Test for right:calc() on absolutely positioned elements - + +
@@ -12,3 +19,5 @@ div[style] { background: blue; position: absolute; height: 3px; width: 100px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1-ref.html index 48b129b91608..e4055950ee2f 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1-ref.html @@ -1,10 +1,17 @@ -Test for top:calc() on absolutely positioned elements - + +
@@ -21,3 +28,5 @@ div[style] { background: blue; position: relative; height: 10px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1.html index 5a990eed9f51..6a1dd80208ae 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1.html @@ -1,11 +1,18 @@ -Test for top:calc() on absolutely positioned elements - + +
@@ -22,3 +29,5 @@ div.space { height: 100px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-bottom-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-bottom-1.html index 14b2eb8be495..88ab0efb3539 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-bottom-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-bottom-1.html @@ -1,10 +1,17 @@ -Test for bottom:calc() on relatively positioned elements - + +
@@ -21,3 +28,5 @@ div[style] { background: blue; position: relative; height: 10px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1-ref.html index 091f3918efdf..eb542bef9587 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1-ref.html @@ -1,9 +1,16 @@ -Test for left:calc() on relatively positioned elements - + +
@@ -11,3 +18,5 @@ div[style] { background: blue; position: relative; height: 3px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1.html index 7382c5654d7b..6546362004b0 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1.html @@ -1,9 +1,16 @@ -Test for left:calc() on relatively positioned elements - + +
@@ -11,3 +18,5 @@ div[style] { background: blue; position: relative; height: 3px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-right-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-right-1.html index 0535e7b3f8cd..b24e8b8b1cf8 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-right-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-right-1.html @@ -1,9 +1,16 @@ -Test for right:calc() on relatively positioned elements - + +
@@ -11,3 +18,5 @@ div[style] { background: blue; position: relative; height: 3px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1-ref.html index 2c19cce310ec..b220f6194b03 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1-ref.html @@ -1,10 +1,17 @@ -Test for top:calc() on relatively positioned elements - + +
@@ -21,3 +28,5 @@ div[style] { background: blue; position: relative; height: 10px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1.html b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1.html index 6966078a448a..858ee0a0a74e 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1.html @@ -1,10 +1,17 @@ -Test for top:calc() on relatively positioned elements - + +
@@ -21,3 +28,5 @@ div[style] { background: blue; position: relative; height: 10px; }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1-ref.html index cc39204ac100..37d0f7993e45 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1-ref.html @@ -1,15 +1,24 @@ -Test of padding-*: calc() - + +

paragraph with padding

paragraph with padding

paragraph with padding

paragraph with padding

paragraph with padding

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1.html index bea0cdcd001b..7b138c650317 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1.html @@ -1,15 +1,24 @@ -Test of padding-*: calc() - + +

paragraph with padding

paragraph with padding

paragraph with padding

paragraph with padding

paragraph with padding

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1-ref.html index c845832e47da..97a1326619ff 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1-ref.html @@ -1,11 +1,18 @@ -text-indent: calc() - + +

50% - 3px

25% - 3px + 25%

@@ -14,3 +21,5 @@ p { font-size: 10px }

25% - 3px + 2*12.5%

25% - 3px + 2 * 12.5%

30% + 20%

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1.html b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1.html index 0cb313b0b834..0cc66a1559e1 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1.html @@ -1,11 +1,18 @@ -text-indent: calc() on blocks - + +

50% - 3px

25% - 3px + 25%

@@ -14,3 +21,5 @@ p { font-size: 10px }

25% - 3px + 2*12.5%

25% - 3px + 2 * 12.5%

30% + 20%

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1-ref.html index 9bea6b999a85..9d6f3c3a9cdb 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1-ref.html @@ -1,10 +1,17 @@ -intrinsic width of text-indent: calc() on blocks - + +
@@ -12,3 +19,5 @@ body > div { margin: 0 0 1px 0; background: blue; color: white; height: 5px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1.html b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1.html index 88269f552470..74379a557ba1 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1.html @@ -1,6 +1,11 @@ -intrinsic width of text-indent: calc() on blocks - + +
@@ -15,3 +22,5 @@ span { display: inline-block; width: 10px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1-ref.html index 841ad3d47090..2470c6c3b9ef 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1-ref.html @@ -1,6 +1,11 @@ -Test for calc() on transform-origin - + +

hello

hello

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1.html b/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1.html index 5fa2ff99b636..94ce6b8cc81b 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1.html @@ -1,6 +1,11 @@ -Test for calc() on transform-origin - + +

hello

hello

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1-ref.html index 10c7379c9350..fdf54b149d1b 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1-ref.html @@ -1,5 +1,10 @@ -Test for vertical-align:calc() + + + CSS Reference: Test for vertical-align:calc() + + +
x @@ -10,3 +15,5 @@ x x
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1.html b/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1.html index 2bc651744c9f..9d06ef31c32a 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1.html @@ -1,5 +1,10 @@ -Test for vertical-align:calc() + + + CSS Test: Test for vertical-align:calc() + + +
x @@ -10,3 +15,5 @@ x x
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-block-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-width-block-1-ref.html index 5c6f0daff87d..899e32040bb9 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-block-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-block-1-ref.html @@ -1,11 +1,18 @@ -width: calc() and min-width: calc() on blocks - + +

50% - 3px

25% - 3px + 25%

@@ -14,3 +21,5 @@ p { background: green; color: white; margin: 1px 0; font-size: 10px }

25% - 3px + 2*12.5%

25% - 3px + 2 * 12.5%

30% + 20%

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-block-1.html b/layout/reftests/w3c-css/submitted/values3/calc-width-block-1.html index e404bc0f9274..5edd1a260238 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-block-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-block-1.html @@ -1,11 +1,18 @@ -width: calc() on blocks - + +

50% - 3px

25% - 3px + 25%

@@ -14,3 +21,5 @@ p { background: green; color: white; margin: 1px 0; font-size: 10px }

25% - 3px + 2*12.5%

25% - 3px + 2 * 12.5%

30% + 20%

+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1-ref.html index 6320b6968f93..732e200b4935 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1-ref.html @@ -1,10 +1,17 @@ -intrinsic width of width: calc() on blocks - + +
@@ -12,3 +19,5 @@ body > div { margin: 0 0 1px 0; background: blue; color: white; height: 5px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1.html b/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1.html index 4c21ac328746..233ea8297f32 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1.html @@ -1,6 +1,11 @@ -intrinsic width of width: calc() on blocks - + +
@@ -15,3 +22,5 @@ body > div > div > div { width: 200px }
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1-ref.html index d2e4448773c3..3d3baf2493a8 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1-ref.html @@ -1,5 +1,10 @@ -width: calc() on table-layout: auto tables + + + CSS Reference: width: calc() on table-layout: auto tables + + + @@ -15,3 +20,5 @@
xx y
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1.html b/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1.html index 0ba832c24e5d..94092afeb10b 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1.html @@ -1,5 +1,10 @@ -width: calc() on table-layout: auto tables + + + CSS Test: width: calc() on table-layout: auto tables + + + @@ -15,3 +20,5 @@
xx y
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1-ref.html b/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1-ref.html index 669d41c03a45..f8d6fadbaef5 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1-ref.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1-ref.html @@ -1,8 +1,15 @@ -width: calc() on table-layout: auto tables - + + @@ -18,3 +25,5 @@ table { table-layout: fixed; width: 500px; border-spacing: 0 }
xx y
+ + diff --git a/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1.html b/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1.html index 0220b4feb215..14f1a5b5921c 100644 --- a/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1.html +++ b/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1.html @@ -1,8 +1,15 @@ -width: calc() on table-layout: auto tables - + + @@ -18,3 +25,5 @@ table { table-layout: fixed; width: 500px; border-spacing: 0 }
xx y
+ +