Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit bb13805

Browse files
dbarondbaron
committed
Merge, since hg->git wasn't syncing.
2 parents 9ecf789 + a46116d commit bb13805

File tree

50 files changed

+1457
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1457
-20
lines changed

‎vendor-imports/mozilla/mozilla-central-reftests/background/background-attachment-fixed-inside-transform-1-ref.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>CSS Background: background-attachment: background-attachment:fixed inside a transform</title>
6+
<link rel="author" title="Botond Ballo" href="mailto:botond@mozilla.com">
7+
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
8+
<style type="text/css">
9+
body {
10+
height: 4000px;
11+
margin: 0;
12+
}
13+
14+
#outer {
15+
margin: 200px;
16+
height: 700px;
17+
width: 300px;
18+
transform: rotate(45deg);
19+
overflow: hidden;
20+
}
21+
22+
#inner {
23+
height: 700px;
24+
background-image: radial-gradient(farthest-corner at center, blue, black);
25+
background-size: 300px 300px;
26+
background-position: 200px 200px;
27+
background-color: lime;
28+
background-repeat: no-repeat;
29+
background-attachment: scroll;
30+
}
31+
</style>
32+
</head>
33+
<body>
34+
<div id="outer">
35+
<div id="inner">
36+
</div>
37+
</div>
38+
</body>
39+
</html>

‎vendor-imports/mozilla/mozilla-central-reftests/background/background-attachment-fixed-inside-transform-1.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>CSS Background: background-attachment: background-attachment:fixed inside a transform</title>
6+
<link rel="author" title="Botond Ballo" href="mailto:botond@mozilla.com">
7+
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
8+
<link rel="help" href="https://www.w3.org/TR/css-transforms-1/#transform-rendering">
9+
<link rel="match" href="background-attachment-fixed-inside-transform-1-ref.html">
10+
<meta name="assert" content="Test checks whether background-attachment: 'fixed' inside a transform behaves like background-attachment: 'scroll'.">
11+
<style>
12+
body {
13+
height: 4000px;
14+
margin: 0;
15+
}
16+
17+
#outer {
18+
margin: 200px;
19+
height: 700px;
20+
width: 300px;
21+
transform: rotate(45deg);
22+
overflow: hidden;
23+
}
24+
25+
#inner {
26+
height: 700px;
27+
background-image: radial-gradient(farthest-corner at center, blue, black);
28+
background-size: 300px 300px;
29+
background-position: 200px 200px;
30+
background-color: lime;
31+
background-repeat: no-repeat;
32+
background-attachment: fixed;
33+
}
34+
</style>
35+
</head>
36+
<body>
37+
<div id="outer">
38+
<div id="inner">
39+
</div>
40+
</div>
41+
</body>
42+
</html>

‎vendor-imports/mozilla/mozilla-central-reftests/background/reftest.list‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@
3333
== border-image-repeat-space-6.html border-image-repeat-space-6-ref.html
3434
== border-image-repeat-space-7.html border-image-repeat-space-7-ref.html
3535
== border-image-repeat-1.html border-image-repeat-1-ref.html
36+
37+
# background-attachment test cases
38+
== background-attachment-fixed-inside-transform-1.html background-attachment-fixed-inside-transform-1-ref.html

‎vendor-imports/mozilla/mozilla-central-reftests/masking/mask-image-3i.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>CSS Masking: mask-image: interleave SVG mask with image mask</title>
6+
<link rel="author" title="CJ Ku" href="mailto:cku@mozilla.com">
7+
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
8+
<link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-image">
9+
<link rel="match" href="mask-image-3-ref.html">
10+
<meta name="assert" content="Test checks whether SVG mask and image as mask layer works correctly or not.">
11+
<svg height="0">
12+
<mask id="mask1" x="0" y="0" width="1" height="1" >
13+
<circle cx="50" cy="50" r="25" style="stroke:none; fill: #ffffff"/>
14+
</mask>
15+
</svg>
16+
<style type="text/css">
17+
rect {
18+
fill: purple;
19+
mask-image: url(#mask1), url(support/50x50-opaque-blue.svg);
20+
mask-repeat: no-repeat, no-repeat;
21+
}
22+
</style>
23+
24+
</head>
25+
26+
<body>
27+
<br>
28+
<svg width="100" height="100">
29+
<rect x="0" y="0" width="100" height="100"/>
30+
</svg>
31+
</body>
32+
</html>

‎vendor-imports/mozilla/mozilla-central-reftests/masking/reftest.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
== mask-image-3f.html mask-image-3-ref.html
2828
== mask-image-3g.html mask-image-3-ref.html
2929
== mask-image-3h.html mask-image-3-ref.html
30+
== mask-image-3i.html mask-image-3-ref.html
3031
== mask-image-4a.html blank.html
3132
== mask-image-4b.html blank.html
3233
== mask-image-5.html mask-image-5-ref.html

‎vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,22 @@
1414
== shape-outside-margin-box-border-radius-002.html shape-outside-margin-box-border-radius-002-ref.html
1515
== shape-outside-margin-box-border-radius-003.html shape-outside-margin-box-border-radius-003-ref.html
1616
== shape-outside-margin-box-border-radius-004.html shape-outside-margin-box-border-radius-004-ref.html
17+
== shape-outside-margin-box-border-radius-005.html shape-outside-margin-box-border-radius-005-ref.html
18+
== shape-outside-margin-box-border-radius-006.html shape-outside-margin-box-border-radius-006-ref.html
19+
== shape-outside-margin-box-border-radius-007.html shape-outside-margin-box-border-radius-007-ref.html
20+
== shape-outside-margin-box-border-radius-008.html shape-outside-margin-box-border-radius-008-ref.html
1721
== shape-outside-border-box-border-radius-001.html shape-outside-border-box-border-radius-001-ref.html
1822
== shape-outside-border-box-border-radius-002.html shape-outside-border-box-border-radius-002-ref.html
1923
== shape-outside-border-box-border-radius-003.html shape-outside-border-box-border-radius-003-ref.html
2024
== shape-outside-border-box-border-radius-004.html shape-outside-border-box-border-radius-004-ref.html
25+
== shape-outside-border-box-border-radius-005.html shape-outside-border-box-border-radius-005-ref.html
26+
== shape-outside-border-box-border-radius-006.html shape-outside-border-box-border-radius-006-ref.html
27+
== shape-outside-border-box-border-radius-007.html shape-outside-border-box-border-radius-007-ref.html
28+
== shape-outside-border-box-border-radius-008.html shape-outside-border-box-border-radius-008-ref.html
29+
== shape-outside-border-box-border-radius-009.html shape-outside-border-box-border-radius-009-ref.html
30+
== shape-outside-border-box-border-radius-010.html shape-outside-border-box-border-radius-010-ref.html
31+
== shape-outside-border-box-border-radius-011.html shape-outside-border-box-border-radius-011-ref.html
32+
== shape-outside-border-box-border-radius-012.html shape-outside-border-box-border-radius-012-ref.html
2133
== shape-outside-padding-box-border-radius-001.html shape-outside-padding-box-border-radius-001-ref.html
2234
== shape-outside-padding-box-border-radius-002.html shape-outside-padding-box-border-radius-002-ref.html
2335
== shape-outside-content-box-border-radius-001.html shape-outside-content-box-border-radius-001-ref.html

‎vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>CSS Shape Test: float left, border-box</title>
88
<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
99
<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
10-
<link rel="help" href="https://drafts.csswg.org/css-shapes/#shapes-from-box-values">
10+
<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
1111
<link rel="match" href="shape-outside-border-box-001-ref.html">
1212
<meta name="flags" content="">
1313
<meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box value.">

‎vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>CSS Shape Test: float right, border-box</title>
88
<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
99
<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
10-
<link rel="help" href="https://drafts.csswg.org/css-shapes/#shapes-from-box-values">
10+
<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
1111
<link rel="match" href="shape-outside-border-box-002-ref.html">
1212
<meta name="flags" content="">
1313
<meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box value.">

‎vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>CSS Shape Test: float left, border-box, border-radius</title>
88
<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
99
<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
10-
<link rel="help" href="https://drafts.csswg.org/css-shapes/#shapes-from-box-values">
10+
<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
1111
<link rel="match" href="shape-outside-border-box-border-radius-001-ref.html">
1212
<meta name="flags" content="">
1313
<meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-radius value.">

‎vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>CSS Shape Test: float left, border-box, border-radius, no margin</title>
88
<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
99
<link rel="author" title="Mozilla" href="http://www.mozilla.org/">
10-
<link rel="help" href="https://drafts.csswg.org/css-shapes/#shapes-from-box-values">
10+
<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
1111
<link rel="match" href="shape-outside-border-box-border-radius-002-ref.html">
1212
<meta name="flags" content="">
1313
<meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-radius value.">

0 commit comments

Comments
 (0)