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

Backed out changeset a0621cac7491 (bug 1486252) for wpt failures on /css/css-masking/mask-image/mask-image-url-remote-mask.html

This commit is contained in:
Dorel Luca 2018-09-03 07:15:08 +03:00
Родитель 5f974d420f
Коммит 298b74c266
10 изменённых файлов: 11 добавлений и 271 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
layout/style/nsStyleStruct.cpp
Просмотреть файл

@ -1320,30 +1320,18 @@ nsStyleSVGReset::FinishStyle(nsPresContext* aPresContext, const nsStyleSVGReset*
NS_FOR_VISIBLE_IMAGE_LAYERS_BACK_TO_FRONT(i, mMask) {
nsStyleImage& image = mMask.mLayers[i].mImage;
if (image.GetType() == eStyleImageType_Image) {
URLValueData* url = image.GetURLValue();
// If the url is a local ref, it must be a <mask-resource>, so we don't
// need to resolve the style image.
if (url->IsLocalRef()) {
continue;
}
#if 0
// XXX The old style system also checks whether this is a reference to
// the current document with reference, but it doesn't seem to be a
// behavior mentioned anywhere, so we comment out the code for now.
nsIURI* docURI = aPresContext->Document()->GetDocumentURI();
if (url->EqualsExceptRef(docURI)) {
continue;
}
#endif
// If the url of mask resource contains a reference('#'), it should be a
// <mask-source>, mostly. For a <mask-source>, there is no need to
// resolve this style image, since we do not depend on it to get the
// SVG mask resource.
if (!image.GetURLValue()->HasRef()) {
const nsStyleImage* oldImage =
(aOldStyle && aOldStyle->mMask.mLayers.Length() > i)
? &aOldStyle->mMask.mLayers[i].mImage
: nullptr;
// Otherwise, we may need the image even if it has a reference, in case
// the referenced element isn't a valid SVG <mask> element.
const nsStyleImage* oldImage =
(aOldStyle && aOldStyle->mMask.mLayers.Length() > i)
? &aOldStyle->mMask.mLayers[i].mImage
: nullptr;
image.ResolveImage(aPresContext, oldImage);
image.ResolveImage(aPresContext, oldImage);
}
}
}
}

100
testing/web-platform/meta/MANIFEST.json
Просмотреть файл

@ -125343,54 +125343,6 @@
{}
]
],
"css/css-masking/mask-image/mask-image-url-image-hash.html": [
[
"/css/css-masking/mask-image/mask-image-url-image-hash.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/mask-image/mask-image-url-image.html": [
[
"/css/css-masking/mask-image/mask-image-url-image.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/mask-image/mask-image-url-local-mask.html": [
[
"/css/css-masking/mask-image/mask-image-url-local-mask.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/mask-image/mask-image-url-remote-mask.html": [
[
"/css/css-masking/mask-image/mask-image-url-remote-mask.html",
[
[
"/css/css-masking/mask-image/reference/mask-image-ref.html",
"=="
]
],
{}
]
],
"css/css-masking/test-mask.html": [
[
"/css/css-masking/test-mask.html",
@ -256732,26 +256684,6 @@
{}
]
],
"css/css-masking/mask-image/reference/mask-image-ref.html": [
[
{}
]
],
"css/css-masking/mask-image/support/image-with-ref.svg": [
[
{}
]
],
"css/css-masking/mask-image/support/image.svg": [
[
{}
]
],
"css/css-masking/mask-image/support/mask.svg": [
[
{}
]
],
"css/css-masking/parsing/support/parsing-testcommon.js": [
[
{}
@ -540585,38 +540517,6 @@
"c415eaaa67a2bc9a4b621700049eb0c0b60ec0a3",
"testharness"
],
"css/css-masking/mask-image/mask-image-url-image-hash.html": [
"b1efc90818bec85d5022a9b908a14c2e0c35ff3b",
"reftest"
],
"css/css-masking/mask-image/mask-image-url-image.html": [
"40a1ff9b281647a03cd90046cb62a088c0ed7081",
"reftest"
],
"css/css-masking/mask-image/mask-image-url-local-mask.html": [
"18abc54f85eb4bfd93962dbef92dd5cffe5ba62b",
"reftest"
],
"css/css-masking/mask-image/mask-image-url-remote-mask.html": [
"f3f2eefaa92df83296379efd861b39e2ab65f78e",
"reftest"
],
"css/css-masking/mask-image/reference/mask-image-ref.html": [
"4e121163f9d093b468e710882cb164bb965d9aa8",
"support"
],
"css/css-masking/mask-image/support/image-with-ref.svg": [
"fe77fb37ac60a8a503d849d019c9ca391d9cf523",
"support"
],
"css/css-masking/mask-image/support/image.svg": [
"28dbaa0238353b47b0d7877cac054d002352078a",
"support"
],
"css/css-masking/mask-image/support/mask.svg": [
"cab55923d32ddb9525cb81a12d8035b1bf51bb4c",
"support"
],
"css/css-masking/parsing/clip-invalid.html": [
"18ae8b552a5904097a4b9f0f639b3d0ca123242b",
"testharness"

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

@ -1,28 +0,0 @@
<!DOCTYPE html>
<title>CSS Test: mask-image: url(image.svg#hash)</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-ref.html">
<meta name="assert" content="mask-image can use an SVG file as an image with element reference">
<style>
#back {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 60px solid green;
background: red;
}
#front {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 40px solid red;
background: green;
mask-image: url(support/image-with-ref.svg#ref);
}
</style>
<p>The test passes if there is a green square and no red below.</p>
<div id="back"></div><div id="front"></div>

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

@ -1,28 +0,0 @@
<!DOCTYPE html>
<title>CSS Test: mask-image: url(image.svg)</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-ref.html">
<meta name="assert" content="mask-image can use an SVG file as an image">
<style>
#back {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 60px solid green;
background: red;
}
#front {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 40px solid red;
background: green;
mask-image: url(support/image.svg);
}
</style>
<p>The test passes if there is a green square and no red below.</p>
<div id="back"></div><div id="front"></div>

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

@ -1,33 +0,0 @@
<!DOCTYPE html>
<title>CSS Test: mask-image: url(#local-mask)</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-ref.html">
<meta name="assert" content="mask-image can use local reference to a &lt;mask&gt; element">
<style>
#back {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 60px solid green;
background: red;
}
#front {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 40px solid red;
background: green;
mask-image: url(#localmask);
}
</style>
<p>The test passes if there is a green square and no red below.</p>
<div id="back"></div><div id="front"></div>
<svg viewBox="0 0 200 200" style="width: 0; height: 0">
<mask id="localmask">
<rect x="50" y="50" width="100" height="100" fill="white">
</mask>
</svg>

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

@ -1,28 +0,0 @@
<!DOCTYPE html>
<title>CSS Test: mask-image: url(remote.svg#mask)</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
<link rel="match" href="reference/mask-image-ref.html">
<meta name="assert" content="mask-image can use reference to a &lt;mask&gt; element from a remote SVG document">
<style>
#back {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 60px solid green;
background: red;
}
#front {
position: absolute;
box-sizing: border-box;
width: 200px;
height: 200px;
border: 40px solid red;
background: green;
mask-image: url(support/mask.svg#mask);
}
</style>
<p>The test passes if there is a green square and no red below.</p>
<div id="back"></div><div id="front"></div>

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

@ -1,14 +0,0 @@
<!DOCTYPE html>
<title>CSS Reference: mask-image</title>
<link rel="author" title="Xidorn Quan" href="https://www.upsuper.org">
<link rel="author" title="Mozilla" href="https://www.mozilla.org">
<style>
#ref {
position: absolute;
width: 200px;
height: 200px;
background: green;
}
</style>
<p>The test passes if there is a green square and no red below.</p>
<div id="ref"></div>

9
testing/web-platform/tests/css/css-masking/mask-image/support/image-with-ref.svg
Просмотреть файл

@ -1,9 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
<style>
g { display: none; }
g:target { display: inline; }
</style>
<g id="ref">
<rect x="50" y="50" width="100" height="100" fill="black"/>
</g>
</svg>
Режим "рядом"

До

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

3
testing/web-platform/tests/css/css-masking/mask-image/support/image.svg
Просмотреть файл

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
<rect x="50" y="50" width="100" height="100" fill="black"/>
</svg>
Режим "рядом"

До

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

5
testing/web-platform/tests/css/css-masking/mask-image/support/mask.svg
Просмотреть файл

@ -1,5 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
<mask id="mask">
<rect x="50" y="50" width="100" height="100" fill="white"/>
</mask>
</svg>
Режим "рядом"

До

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