mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1356712 - Remove bogus assertions. r=emilio 

Differential Revision: https://phabricator.services.mozilla.com/D52678

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mats Palmgren 2019-11-12 19:09:13 +00:00
Родитель 012de1a3a6
Коммит 9ae23f45d4
8 изменённых файлов: 121 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
layout/painting/nsCSSRendering.cpp
Просмотреть файл

@ -532,16 +532,12 @@ static nsRect JoinBoxesForBlockAxisSlice(nsIFrame* aFrame,
auto wm = aFrame->GetWritingMode();
nsIFrame* f = aFrame->GetNextContinuation();
for (; f; f = f->GetNextContinuation()) {
MOZ_ASSERT(!(f->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT),
"anonymous ib-split block shouldn't have border/background");
bSize += f->BSize(wm);
}
(wm.IsVertical() ? borderArea.width : borderArea.height) += bSize;
bSize = 0;
f = aFrame->GetPrevContinuation();
for (; f; f = f->GetPrevContinuation()) {
MOZ_ASSERT(!(f->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT),
"anonymous ib-split block shouldn't have border/background");
bSize += f->BSize(wm);
}
(wm.IsVertical() ? borderArea.x : borderArea.y) -= bSize;

27
testing/web-platform/tests/css/css-masking/mask-image/mask-image-data-url-image.html Normal file
Просмотреть файл

@ -0,0 +1,27 @@
<!DOCTYPE html>
<title>CSS Test: mask-image: url(data:...)</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-data-url-image-ref.html">
<meta name="assert" content="mask-image can use a data: URL as an image">
<style>
#back {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 60px solid green;
background: blue;
}
#front {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 40px solid blue;
background: green;
mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGDwAQAAUQBNt+pgmgAAAABJRU5ErkJggg==); /* 1x1 black with 30% transparency */
}
</style>
<p>The test passes if there is a blue-ish square with a 20px green border around it and a 40px blue-green-ish border around that.</p>
<div id="back"></div><div id="front"></div>

24
testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split-2.html Normal file
Просмотреть файл

@ -0,0 +1,24 @@
<!DOCTYPE html>
<title>CSS Test: mask-image on a fragmented inline</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-ib-split-2-ref.html">
<meta name="assert" content="mask-image applies to all fragments">
<style>
columns {
display: block;
columns: 5;
column-fill: auto;
column-gap: 10px;
height: 30px;
background: pink;
}
div { background: grey; height: 50px; }
x {
background: grey;
mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAABqklEQVRYhdXZMa6DMAwAUCOxcQAEF0BIzgG6MTEiJcfhItys1yhrl/oP8AvFScP/BJJUYmlR8mo7BgKAgw9JHEiJkRQ+Pw8xksTBxRzHYBJfJPFFStDXYznvGjhJHHbB9sHdg6cI4tMJco2dxnQDJol3OxB7kuJGqi6ozTNq84xUXUzfYb8juveDSPH4imvzjAAS6zgAyYT/gpbi4RiJPTWQ/mtQAKAGUiP4r1gjsqvKPRG0jg+QUFeVh7Ak8e46isa5TNG11ay+/WDvIorGOQEShrW1r/lq8vnvTogkm7eBVJPFp/5kXTS7qjwb+Z5/W7OmqF6dcja/oQS2yMFHyhlWVwLrqJIS4zaaVyMXC+sC4/LjNu1tnnmDtnlmTD+DXlibDAqQaKG8Pv2l/fejWVQDr08pbt6hUtxYnfImXxfeoaouWPNnUI8L6Q3dLqi4oeGmPpbFFEt7Aoik4WuhwV5CI7opieM2b8aGf+M8Q+N4FAGI5OEOIKLH5Rkb/gbEgo1gS8eKDWmTzI6dwSFsOy7YCDZyV9jwt8YZOOSXDVpwyK9vrPATX4j9ALzDM3y+40zWAAAAAElFTkSuQmCC);
}
.end { mask-position:100% 100%; mask-repeat: no-repeat; }
</style>
<body><columns><x><div></div></x></columns><columns><x class="end"><div></div></x></columns></body>
</html>

14
testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split.html Normal file
Просмотреть файл

@ -0,0 +1,14 @@
<!DOCTYPE html>
<title>CSS Test: mask-image on an inline with a block inside split by a columnset</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-ib-split-ref.html">
<meta name="assert" content="mask-image applies to the block child">
<style>
body { column-width: 40px; column-gap: 0; }
div { padding-inline-start: 40px; margin: 1em 0; border-bottom-style: solid; }
span { margin-inline-end: -2px; }
x { mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGDwAQAAUQBNt+pgmgAAAABJRU5ErkJggg==); }
</style>
<body><x><span></span><div></div></x></body>
</html>

Двоичные данные
testing/web-platform/tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 109 B

24
testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html Normal file
Просмотреть файл

@ -0,0 +1,24 @@
<!DOCTYPE html>
<title>Reference: mask-image: url(data:...)</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style>
#back {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 60px solid green;
background: blue;
}
#front {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 40px solid blue;
background: green;
mask-image: url(1x1-black-30-alpha.png); /* 1x1 black with 30% transparency */
}
</style>
<p>The test passes if there is a blue-ish square with a 20px green border around it and a 40px blue-green-ish border around that.</p>
<div id="back"></div><div id="front"></div>

21
testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html Normal file
Просмотреть файл

@ -0,0 +1,21 @@
<!DOCTYPE html>
<title>CSS Test: mask-image on a fragmented inline</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style>
columns {
display: block;
columns: 5;
column-fill: auto;
column-gap: 10px;
height: 30px;
background: pink;
}
div { background: grey; height: 50px; }
x {
background: grey;
mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAABqklEQVRYhdXZMa6DMAwAUCOxcQAEF0BIzgG6MTEiJcfhItys1yhrl/oP8AvFScP/BJJUYmlR8mo7BgKAgw9JHEiJkRQ+Pw8xksTBxRzHYBJfJPFFStDXYznvGjhJHHbB9sHdg6cI4tMJco2dxnQDJol3OxB7kuJGqi6ozTNq84xUXUzfYb8juveDSPH4imvzjAAS6zgAyYT/gpbi4RiJPTWQ/mtQAKAGUiP4r1gjsqvKPRG0jg+QUFeVh7Ak8e46isa5TNG11ay+/WDvIorGOQEShrW1r/lq8vnvTogkm7eBVJPFp/5kXTS7qjwb+Z5/W7OmqF6dcja/oQS2yMFHyhlWVwLrqJIS4zaaVyMXC+sC4/LjNu1tnnmDtnlmTD+DXlibDAqQaKG8Pv2l/fejWVQDr08pbt6hUtxYnfImXxfeoaouWPNnUI8L6Q3dLqi4oeGmPpbFFEt7Aoik4WuhwV5CI7opieM2b8aGf+M8Q+N4FAGI5OEOIKLH5Rkb/gbEgo1gS8eKDWmTzI6dwSFsOy7YCDZyV9jwt8YZOOSXDVpwyK9vrPATX4j9ALzDM3y+40zWAAAAAElFTkSuQmCC);
}
.end { mask-position:100% 100%; mask-repeat: no-repeat; }
</style>
<body><columns><x style="display:block"><div></div></x></columns><columns><x style="display:block; background: grey; height: 50px;" class="end"></x></columns></body>
</html>

11
testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<!DOCTYPE html>
<title>CSS Reference: mask-image on an inline with a block inside split by a columnset</title>
<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
<style>
body { column-width: 40px; column-gap: 0; }
div { padding-inline-start: 40px; margin: 1em 0; border-bottom-style: solid; }
span { margin-inline-end: -2px; }
div { mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGDwAQAAUQBNt+pgmgAAAABJRU5ErkJggg==); }
</style>
<body><x><span></span><div></div></x></body>
</html>