wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 887741 - Allow CSS at-rules in declaration lists. r=dbaron

Browse Source
This commit is contained in:
Simon Sapin 2013-07-25 09:43:29 -04:00
parent 8cff96de7a
commit a0a01a0ada
3 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layout/style/nsCSSParser.cpp
View File

@ -4704,6 +4704,11 @@ CSSParserImpl::ParseDeclaration(css::Declaration* aDeclaration,
REPORT_UNEXPECTED_TOKEN(PEParseDeclarationDeclExpected);
REPORT_UNEXPECTED(PEDeclSkipped);
OUTPUT_ERROR();
if (eCSSToken_AtKeyword == tk->mType) {
SkipAtRule(checkForBraces);
return true; // Not a declaration, but don’t skip until ';'
}
}
// Not a declaration...
UngetToken();

1
layout/style/test/Makefile.in
View File

@ -86,6 +86,7 @@ MOCHITEST_FILES = test_acid3_test46.html \
test_bug798567.html \
test_bug829816.html \
file_bug829816.css \
test_bug887741_at-rules_in_declaration_lists.html \
test_cascade.html \
test_ch_ex_no_infloops.html \
test_compute_data_with_start_struct.html \

75
layout/style/test/test_bug887741_at-rules_in_declaration_lists.html Normal file
View File

@ -0,0 +1,75 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=887741
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 887741: at-rules in declaration lists</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<style>
#foo {
color: red;
@invalid-rule {
ignored: ignored;
}
/* No semicolon */
color: green;
}
@page {
margin-top: 0;
@bottom-center {
content: counter(page);
}
/* No semicolon */
margin-top: 5cm;
}
@keyframes dummy-animation {
12% {
color: red;
@invalid-rule {}
/* No semicolon */
color: green;
}
}
/* TODO: other at-rules that use declaration syntax? */
</style>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=887741">Mozilla Bug 887741</a>
<p id="display"></p>
<div id="content" style="display: none; color: red;
@invalid-rule{} /* No semicolon */ color: green;">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 887741 **/
var style = document.getElementById('content').style;
is(style.display, 'none', 'Sanity check: we have the right element');
is(style.color, 'green', 'Support at-rules in style attributes');
style.cssText = 'display: none; color: red; @invalid-rule{} /* No semicolon */ color: lime;';
is(style.color, 'lime', 'Support at-rules in CSSStyleDeclaration.cssText');
var rules = document.styleSheets[0].cssRules;
var style_rule = rules[0];
is(style_rule.selectorText, '#foo', 'Sanity check: we have the right style rule');
is(style_rule.style.color, 'green', 'Support at-rules in style rules');
var page_rule = rules[1];
is(page_rule.type, page_rule.PAGE_RULE, 'Sanity check: we have the right style rule');
is(page_rule.style.marginTop, '5cm', 'Support at-rules in @page rules');
var keyframe_rule = rules[2].cssRules[0];
is(keyframe_rule.keyText, '12%', 'Sanity check: we have the right keyframe rule');
is(keyframe_rule.style.color, 'green', 'Support at-rules in keyframe rules')
</script>
</pre>
</body>
</html>