Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1057900 - Resolve calc values for CSS blur() in nsRuleNode instead of storing them. r=dbaron,mstange

Browse Source
This commit is contained in:
Max Vujovic 2014-08-26 11:11:45 -07:00
parent 7141c60325
commit 2782960f7a
6 changed files with 111 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/reftests/svg/filters/css-filters/blur-calc-negative-ref.html Normal file
View File

@ -0,0 +1,27 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE html>
<html>
<head>
<title>CSS Filters: Blur an HTML Element Using a Negative Calc Function Value</title>
<link rel="author" title="Max Vujovic" href="mailto:mvujovic@adobe.com">
<link rel="help" href="http://www.w3.org/TR/filter-effects-1/#funcdef-blur">
<link rel="match" href="blur-calc-negative-ref.html">
<meta name="assert"
content="Given a calc() value that evaluates to a negative result, the
CSS blur filter function should not blur an HTML element.">
<style type="text/css">
#target {
background-color: #0f0;
width: 100px;
height: 100px;
}
</style>
</head>
<body>
<p>You should see a green square.</p>
<div id="target"></div>
</body>
</html>

28
layout/reftests/svg/filters/css-filters/blur-calc-negative.html Normal file
View File

@ -0,0 +1,28 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE html>
<html>
<head>
<title>CSS Filters: Blur an HTML Element Using a Negative Calc Function Value</title>
<link rel="author" title="Max Vujovic" href="mailto:mvujovic@adobe.com">
<link rel="help" href="http://www.w3.org/TR/filter-effects-1/#funcdef-blur">
<link rel="match" href="blur-calc-negative-ref.html">
<meta name="assert"
content="Given a calc() value that evaluates to a negative result, the
CSS blur filter function should not blur an HTML element.">
<style type="text/css">
#target {
filter: blur(calc(-10px));
background-color: #0f0;
width: 100px;
height: 100px;
}
</style>
</head>
<body>
<p>You should see a green square.</p>
<div id="target"></div>
</body>
</html>

23
layout/reftests/svg/filters/css-filters/blur-calc-ref.html Normal file
View File

@ -0,0 +1,23 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE html>
<html>
<head>
<title>CSS Filters: Blur an HTML Element Using a Calc Function Value</title>
<link rel="author" title="Max Vujovic" href="mailto:mvujovic@adobe.com">
<style type="text/css">
#target {
filter: blur(10px);
background-color: #0f0;
width: 100px;
height: 100px;
}
</style>
</head>
<body>
<p>You should see a blurred green square.</p>
<div id="target"></div>
</body>
</html>

28
layout/reftests/svg/filters/css-filters/blur-calc.html Normal file
View File

@ -0,0 +1,28 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE html>
<html>
<head>
<title>CSS Filters: Blur an HTML Element Using a Calc Function Value</title>
<link rel="author" title="Max Vujovic" href="mailto:mvujovic@adobe.com">
<link rel="help" href="http://www.w3.org/TR/filter-effects-1/#funcdef-blur">
<link rel="match" href="blur-calc-ref.html">
<meta name="assert"
content="Given a calc() value that evaluates to a positive result, the
CSS blur filter function should blur an HTML element.">
<style type="text/css">
#target {
filter: blur(calc(2 * 5px));
background-color: #0f0;
width: 100px;
height: 100px;
}
</style>
</head>
<body>
<p>You should see a blurred green square.</p>
<div id="target"></div>
</body>
</html>

2
layout/reftests/svg/filters/css-filters/reftest.list
View File

@ -5,6 +5,8 @@ default-preferences pref(layout.css.filters.enabled,true)
== blur.html blur-ref.html
== blur.svg blur-ref.svg
== blur-calc.html blur-calc-ref.html
== blur-calc-negative.html blur-calc-negative-ref.html
== blur-zero-radius.html blur-zero-radius-ref.html
== blur-zoomed-page.html blur-zoomed-page-ref.html
== brightness.html brightness-ref.html

4
layout/style/nsRuleNode.cpp
View File

@ -8708,7 +8708,9 @@ nsRuleNode::SetStyleFilterToCSSValue(nsStyleFilter* aStyleFilter,
int32_t mask = SETCOORD_PERCENT | SETCOORD_FACTOR;
if (type == NS_STYLE_FILTER_BLUR) {
mask = SETCOORD_LENGTH | SETCOORD_STORE_CALC;
mask = SETCOORD_LENGTH |
SETCOORD_CALC_LENGTH_ONLY |
SETCOORD_CALC_CLAMP_NONNEGATIVE;
} else if (type == NS_STYLE_FILTER_HUE_ROTATE) {
mask = SETCOORD_ANGLE;
}