Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1187409 - make CssPropertyIsShorthand handle CSS variables r=heycam

Browse Source 
--HG--
extra : rebase_source : 9006fb95bd6d371367a74c9f687b46c4c9ddffa6
This commit is contained in:
Tom Tromey 2015-08-19 14:48:55 -07:00
parent 43dd938cba
commit 01fd372c45
3 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/inspector/inDOMUtils.cpp
View File

@ -707,7 +707,11 @@ inDOMUtils::CssPropertyIsShorthand(const nsAString& aProperty, bool *_retval)
return NS_ERROR_FAILURE;
}
*_retval = nsCSSProps::IsShorthand(propertyID);
if (propertyID == eCSSPropertyExtra_variable) {
*_retval = false;
} else {
*_retval = nsCSSProps::IsShorthand(propertyID);
}
return NS_OK;
}

1
layout/inspector/tests/mochitest.ini
View File

@ -15,6 +15,7 @@ support-files =
[test_bug877690.html]
[test_bug1006595.html]
[test_color_to_rgba.html]
[test_css_property_is_shorthand.html]
[test_css_property_is_valid.html]
[test_getRelativeRuleLine.html]
[test_get_all_style_sheets.html]

51
layout/inspector/tests/test_css_property_is_shorthand.html Normal file
View File

@ -0,0 +1,51 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test inDOMUtils::CssPropertyIsShorthand</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript;version=1.8">
let utils = SpecialPowers.Cc["@mozilla.org/inspector/dom-utils;1"]
.getService(SpecialPowers.Ci.inIDOMUtils);
let tests = [
{
property: "color",
expected: false
},
{
property: "background",
expected: true
},
{
property: "--anything",
expected: false
}
];
for (let {property, expected} of tests) {
let result = utils.cssPropertyIsShorthand(property);
is(result, expected, "checking whether " + property + " is shorthand");
}
let sawException = false;
try {
let result = utils.cssPropertyIsShorthand("nosuchproperty");
} catch (e) {
sawException = true;
}
ok(sawException, "checking whether nosuchproperty throws");
</script>
</head>
<body>
<h1>Test inDOMUtils::CssPropertyIsShorthand</h1>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
</body>
</html>