mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #14355 - upsuper:rulelist-mutate, r=Manishearth
Move algorithm for insertRule and deleteRule to style component <!-- Please describe your changes on the following line: --> r? @Manishearth --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14355) <!-- Reviewable:end -->
This commit is contained in:
commit
b18ec28fa7
2 changed files with 103 additions and 112 deletions
|
@ -60,6 +60,22 @@ impl From<Vec<CssRule>> for CssRules {
|
|||
}
|
||||
}
|
||||
|
||||
pub enum RulesMutateError {
|
||||
Syntax,
|
||||
IndexSize,
|
||||
HierarchyRequest,
|
||||
InvalidState,
|
||||
}
|
||||
|
||||
impl From<SingleRuleParseError> for RulesMutateError {
|
||||
fn from(other: SingleRuleParseError) -> Self {
|
||||
match other {
|
||||
SingleRuleParseError::Syntax => RulesMutateError::Syntax,
|
||||
SingleRuleParseError::Hierarchy => RulesMutateError::HierarchyRequest,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CssRules {
|
||||
// used in CSSOM
|
||||
pub fn only_ns_or_import(rules: &[CssRule]) -> bool {
|
||||
|
@ -71,36 +87,74 @@ impl CssRules {
|
|||
})
|
||||
}
|
||||
|
||||
// Provides the parser state at a given insertion index
|
||||
pub fn state_at_index(rules: &[CssRule], at: usize) -> State {
|
||||
let mut state = State::Start;
|
||||
if at > 0 {
|
||||
if let Some(rule) = rules.get(at - 1) {
|
||||
state = match *rule {
|
||||
// CssRule::Charset(..) => State::Start,
|
||||
// CssRule::Import(..) => State::Imports,
|
||||
CssRule::Namespace(..) => State::Namespaces,
|
||||
_ => State::Body,
|
||||
};
|
||||
// https://drafts.csswg.org/cssom/#insert-a-css-rule
|
||||
pub fn insert_rule(&self, rule: &str, base_url: ServoUrl, index: usize, nested: bool)
|
||||
-> Result<CssRule, RulesMutateError> {
|
||||
let mut rules = self.0.write();
|
||||
|
||||
// Step 1, 2
|
||||
if index > rules.len() {
|
||||
return Err(RulesMutateError::IndexSize);
|
||||
}
|
||||
|
||||
// Computes the parser state at the given index
|
||||
let state = if nested {
|
||||
None
|
||||
} else if index == 0 {
|
||||
Some(State::Start)
|
||||
} else {
|
||||
rules.get(index - 1).map(CssRule::rule_state)
|
||||
};
|
||||
|
||||
// Step 3, 4
|
||||
// XXXManishearth should we also store the namespace map?
|
||||
let (new_rule, new_state) = try!(CssRule::parse(&rule, Origin::Author, base_url,
|
||||
ParserContextExtraData::default(), state));
|
||||
|
||||
// Step 5
|
||||
// Computes the maximum allowed parser state at a given index.
|
||||
let rev_state = rules.get(index).map_or(State::Body, CssRule::rule_state);
|
||||
if new_state > rev_state {
|
||||
// We inserted a rule too early, e.g. inserting
|
||||
// a regular style rule before @namespace rules
|
||||
return Err(RulesMutateError::HierarchyRequest);
|
||||
}
|
||||
|
||||
// Step 6
|
||||
if let CssRule::Namespace(..) = new_rule {
|
||||
if !CssRules::only_ns_or_import(&rules) {
|
||||
return Err(RulesMutateError::InvalidState);
|
||||
}
|
||||
}
|
||||
state
|
||||
|
||||
rules.insert(index, new_rule.clone());
|
||||
Ok(new_rule)
|
||||
}
|
||||
|
||||
// Provides the maximum allowed parser state at a given index,
|
||||
// searching in reverse. If inserting at this index, the parser
|
||||
// must not be in a state greater than this post-insertion.
|
||||
pub fn state_at_index_rev(rules: &[CssRule], at: usize) -> State {
|
||||
if let Some(rule) = rules.get(at) {
|
||||
match *rule {
|
||||
// CssRule::Charset(..) => State::Start,
|
||||
// CssRule::Import(..) => State::Imports,
|
||||
CssRule::Namespace(..) => State::Namespaces,
|
||||
_ => State::Body,
|
||||
}
|
||||
} else {
|
||||
State::Body
|
||||
// https://drafts.csswg.org/cssom/#remove-a-css-rule
|
||||
pub fn remove_rule(&self, index: usize) -> Result<(), RulesMutateError> {
|
||||
let mut rules = self.0.write();
|
||||
|
||||
// Step 1, 2
|
||||
if index >= rules.len() {
|
||||
return Err(RulesMutateError::IndexSize);
|
||||
}
|
||||
|
||||
{
|
||||
// Step 3
|
||||
let ref rule = rules[index];
|
||||
|
||||
// Step 4
|
||||
if let CssRule::Namespace(..) = *rule {
|
||||
if !CssRules::only_ns_or_import(&rules) {
|
||||
return Err(RulesMutateError::InvalidState);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Step 5, 6
|
||||
rules.remove(index);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -193,6 +247,15 @@ impl CssRule {
|
|||
}
|
||||
}
|
||||
|
||||
fn rule_state(&self) -> State {
|
||||
match *self {
|
||||
// CssRule::Charset(..) => State::Start,
|
||||
// CssRule::Import(..) => State::Imports,
|
||||
CssRule::Namespace(..) => State::Namespaces,
|
||||
_ => State::Body,
|
||||
}
|
||||
}
|
||||
|
||||
/// Call `f` with the slice of rules directly contained inside this rule.
|
||||
///
|
||||
/// Note that only some types of rules can contain rules. An empty slice is used for others.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue