Backed out changeset a2e4bbd59dc7 (bug 1465936) for Web Platform test failures on css/css-contain/contain-paint-005.html

This commit is contained in:
Dorel Luca 2018-06-12 11:59:32 +03:00
Родитель 1719a7ad5a
Коммит 05f09702e7
11 изменённых файлов: 3 добавлений и 430 удалений

Просмотреть файл

@ -1,30 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset=utf-8>
<title>CSS Reftest Reference</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<style>
tr {
z-index: 10;
}
th {
background-color: blue;
padding-left: 50px;
}
caption {
position: fixed;
background-color: yellow;
z-index: 2;
}
</style>
</head>
<body>
<table>
<caption>PASS</caption>
<tr>
<th>&emsp;</th>
</tr>
</table>
</body>
</html>

Просмотреть файл

@ -1,34 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset=utf-8>
<title>CSS-contain test: paint containment on internal table elements except table-cell.</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<link rel="help" href="http://www.w3.org/TR/css-containment-1/#containment-paint">
<link rel="match" href="contain-paint-ignored-cases-internal-table-001-ref.html">
<meta name="assert" content="Paint containment should not apply to internal table elements except table-cell. This test testes only the tr element, and confirms contain:paint does not create a stacking context.">
<style>
tr {
contain: paint;
z-index: 10;
}
th {
background-color: blue;
padding-left: 50px;
}
caption {
position: fixed;
background-color: yellow;
z-index: 2;
}
</style>
</head>
<body>
<table>
<caption>PASS</caption>
<tr>
<th>&emsp;</th>
</tr>
</table>
</body>
</html>

Просмотреть файл

@ -1,36 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset=utf-8>
<title>CSS-contain test: paint containment on internal table elements except table-cell.</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<link rel="help" href="http://www.w3.org/TR/css-containment-1/#containment-paint">
<link rel="match" href="contain-paint-ignored-cases-internal-table-001-ref.html">
<meta name="assert" content="Paint containment should not apply to internal table elements except table-cell. This test testes only the tbody element, and confirms contain:paint does not create a stacking context.">
<style>
tbody {
contain: paint;
z-index: 10;
}
th {
background-color: blue;
padding-left: 50px;
}
caption {
position: fixed;
background-color: yellow;
z-index: 2;
}
</style>
</head>
<body>
<table>
<caption>PASS</caption>
<tbody>
<tr>
<th>&emsp;</th>
</tr>
</tbody>
</table>
</body>
</html>

Просмотреть файл

@ -1,57 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>CSS Reftest Reference</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<style>
div {
position: relative;
width: 100px;
}
#div1,
#div3 {
background-color: #cfc;
height: 100px;
}
#div1 {
z-index: 5;
}
#div2 {
display: contents;
background-color: #fdd;
height: 100px;
top: -20px;
}
#div2_1 {
background-color: #ffc;
z-index: 6;
top: -10px;
height: 100px;
}
#div2_2 {
z-index: 3;
position: absolute;
top: -15px;
width: 40px;
height: 300px;
background-color: #ddf;
}
#div3 {
z-index: 2;
top: -50px;
}
</style>
</head>
<body>
<div id="div1"></div>
<div id="div2">
<div id="div2_1"></div>
<div id="div2_2"></div>
</div>
<div id="div3"></div>
</body>
</html>

Просмотреть файл

@ -1,61 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>CSS Test: 'contain: paint' with 'display: contents'.</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<link rel="help" href="https://drafts.csswg.org/css-contain/#containment-paint">
<link rel="match" href="contain-paint-ignored-cases-no-principal-box-001-ref.html">
<meta name="assert" content="Contain:paint should have no effect when no principle box is generated.">
<style>
div {
position: relative;
width: 100px;
}
#div1,
#div3 {
background-color: #cfc;
height: 100px;
}
#div1 {
z-index: 5;
}
#div2 {
display: contents;
contain: paint;
background-color: #fdd;
height: 100px;
top: -20px;
}
#div2_1 {
background-color: #ffc;
z-index: 6;
top: -10px;
height: 100px;
}
#div2_2 {
z-index: 3;
position: absolute;
top: -15px;
width: 40px;
height: 300px;
background-color: #ddf;
}
#div3 {
z-index: 2;
top: -50px;
}
</style>
</head>
<body>
<div id="div1"></div>
<div id="div2">
<div id="div2_1"></div>
<div id="div2_2"></div>
</div>
<div id="div3"></div>
</body>
</html>

Просмотреть файл

@ -1,37 +0,0 @@
<!doctype html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>CSS Reftest Reference</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<style>
rb,
rbc,
rt,
rtc {
background-color: yellow;
font-size: 2em;
}
rbc {
display: ruby-base-container;
}
.contained {
width: 50px;
height: 10px;
background-color: blue;
top: 0;
left: 0;
position: fixed;
}
.wrapper {
display: inline-block;
}
</style>
</head>
<body>
<div class="wrapper"><ruby><rt>&emsp;<div class="contained"></div></rt></ruby></div>
<div class="wrapper"><ruby><rtc>&emsp;<div class="contained"></div></rtc></ruby></div>
<div class="wrapper"><ruby><rb>&emsp;<div class="contained"></div></rb></ruby></div>
<div class="wrapper"><ruby><rbc>&emsp;<div class="contained"></div></rbc></ruby></div>
</body>
</html>

Просмотреть файл

@ -1,41 +0,0 @@
<!doctype html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>CSS-contain test: paint containment on internal ruby elements.</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<link rel="help" href="http://www.w3.org/TR/css-containment-1/#containment-paint">
<link rel="match" href="contain-paint-ignored-cases-ruby-containing-block-001-ref.html">
<meta name="assert" content="Paint containment should not apply to ruby base, ruby base container, ruby text, and ruby text container. This test confirms contain:paint does not act as a containing block for fixed positioned descendants.">
<style>
rb,
rbc,
rt,
rtc {
contain: paint;
background-color: yellow;
font-size: 2em;
}
rbc {
display: ruby-base-container;
}
.contained {
width: 50px;
height: 10px;
background-color: blue;
top: 0;
left: 0;
position: fixed;
}
.wrapper {
display: inline-block;
}
</style>
</head>
<body>
<div class="wrapper"><ruby><rt>&emsp;<div class="contained"></div></rt></ruby></div>
<div class="wrapper"><ruby><rtc>&emsp;<div class="contained"></div></rtc></ruby></div>
<div class="wrapper"><ruby><rb>&emsp;<div class="contained"></div></rb></ruby></div>
<div class="wrapper"><ruby><rbc>&emsp;<div class="contained"></div></rbc></ruby></div>
</body>
</html>

Просмотреть файл

@ -1,52 +0,0 @@
<!doctype html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>CSS Reftest Reference</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<style>
div {
position: relative;
}
rbc {
display: ruby-base-container;
}
.contained {
z-index: 5;
width: 70px;
height: 10px;
background-color: blue;
margin-left: -25px;
}
.background {
display: inline-block;
background-color: yellow;
height: 50px;
width: 50px;
position: fixed;
z-index: 2;
}
.group {
display: inline-block;
}
</style>
</head>
<body>
<div class="group">
<div class="background"></div>
<ruby><rb>&emsp;<div class="contained"></div></rb></ruby>
</div>
<div class="group">
<div class="background"></div>
<ruby><rbc>&emsp;<div class="contained"></div></rbc></ruby>
</div>
<div class="group">
<div class="background"></div>
<ruby><rt>&emsp;<div class="contained"></div></rt></ruby>
</div>
<div class="group">
<div class="background"></div>
<ruby><rtc>&emsp;<div class="contained"></div></rtc></ruby>
</div>
</body>
</html>

Просмотреть файл

@ -1,60 +0,0 @@
<!doctype html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>CSS-contain test: paint containment on internal ruby elements.</title>
<link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
<link rel="help" href="http://www.w3.org/TR/css-containment-1/#containment-paint">
<link rel="match" href="contain-paint-ignored-cases-ruby-stacking-and-clipping-001-ref.html">
<meta name="assert" content="Paint containment should not apply to ruby base, ruby base container, ruby text, and ruby text container. This test confirms that contain:paint does not create a stacking context and does not apply overflow clipping.">
<style>
div {
position: relative;
}
rb,
rbc,
rt,
rtc {
contain: paint;
}
rbc {
display: ruby-base-container;
}
.contained {
z-index: 5;
width: 70px;
height: 10px;
background-color: blue;
margin-left: -25px;
}
.background {
background-color: yellow;
height: 50px;
width: 50px;
position: fixed;
z-index: 2;
}
.group {
display: inline-block;
}
</style>
</head>
<body>
<div class="group">
<div class="background"></div>
<ruby><rb>&emsp;<div class="contained"></div></rb></ruby>
</div>
<div class="group">
<div class="background"></div>
<ruby><rbc>&emsp;<div class="contained"></div></rbc></ruby>
</div>
<div class="group">
<div class="background"></div>
<ruby><rt>&emsp;<div class="contained"></div></rt></ruby>
</div>
<div class="group">
<div class="background"></div>
<ruby><rtc>&emsp;<div class="contained"></div></rtc></ruby>
</div>
</body>
</html>

Просмотреть файл

@ -10,10 +10,5 @@ pref(layout.css.overflow-clip-box.enabled,true) == contain-paint-clip-006.html c
== contain-paint-containing-block-fixed-001.html contain-paint-containing-block-fixed-001-ref.html
== contain-paint-formatting-context-float-001.html contain-paint-formatting-context-float-001-ref.html
== contain-paint-formatting-context-margin-001.html contain-paint-formatting-context-margin-001-ref.html
== contain-paint-ignored-cases-internal-table-001a.html contain-paint-ignored-cases-internal-table-001-ref.html
== contain-paint-ignored-cases-internal-table-001b.html contain-paint-ignored-cases-internal-table-001-ref.html
== contain-paint-ignored-cases-no-principal-box-001.html contain-paint-ignored-cases-no-principal-box-001-ref.html
== contain-paint-ignored-cases-ruby-containing-block-001.html contain-paint-ignored-cases-ruby-containing-block-001-ref.html
== contain-paint-ignored-cases-ruby-stacking-and-clipping-001.html contain-paint-ignored-cases-ruby-stacking-and-clipping-001-ref.html
== contain-paint-stacking-context-001a.html contain-paint-stacking-context-001-ref.html
== contain-paint-stacking-context-001b.html contain-paint-stacking-context-001-ref.html

Просмотреть файл

@ -2376,11 +2376,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay
bool IsInnerTableStyle() const {
return mozilla::StyleDisplay::TableCaption == mDisplay ||
mozilla::StyleDisplay::TableCell == mDisplay ||
IsInternalTableStyleExceptCell();
}
bool IsInternalTableStyleExceptCell() const {
return mozilla::StyleDisplay::TableRow == mDisplay ||
mozilla::StyleDisplay::TableRow == mDisplay ||
mozilla::StyleDisplay::TableRowGroup == mDisplay ||
mozilla::StyleDisplay::TableHeaderGroup == mDisplay ||
mozilla::StyleDisplay::TableFooterGroup == mDisplay ||
@ -2408,11 +2404,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay
static bool IsRubyDisplayType(mozilla::StyleDisplay aDisplay) {
return mozilla::StyleDisplay::Ruby == aDisplay ||
IsInternalRubyDisplayType(aDisplay);
}
static bool IsInternalRubyDisplayType(mozilla::StyleDisplay aDisplay) {
return mozilla::StyleDisplay::RubyBase == aDisplay ||
mozilla::StyleDisplay::RubyBase == aDisplay ||
mozilla::StyleDisplay::RubyBaseContainer == aDisplay ||
mozilla::StyleDisplay::RubyText == aDisplay ||
mozilla::StyleDisplay::RubyTextContainer == aDisplay;
@ -2422,10 +2414,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay
return IsRubyDisplayType(mDisplay);
}
bool IsInternalRubyDisplayType() const {
return IsInternalRubyDisplayType(mDisplay);
}
bool IsOutOfFlowStyle() const {
return (IsAbsolutelyPositionedStyle() || IsFloatingStyle());
}
@ -2438,9 +2426,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay
}
bool IsContainPaint() const {
return (NS_STYLE_CONTAIN_PAINT & mContain) &&
!IsInternalRubyDisplayType() &&
!IsInternalTableStyleExceptCell();
return NS_STYLE_CONTAIN_PAINT & mContain;
}
/* Returns whether the element has the -moz-transform property