forked from mirrors/gecko-dev
33a9e6d050
<!-- Please describe your changes on the following line: --> Before this PR, every object reflected in CSSOM is in `Arc<RwLock<_>>` to enable safe (synchronized) mutable aliasing. Acquiring all these locks has significant cost during selector matching: * https://bugzilla.mozilla.org/show_bug.cgi?id=1311469 * https://bugzilla.mozilla.org/show_bug.cgi?id=1335941 * https://bugzilla.mozilla.org/show_bug.cgi?id=1339703 This PR introduce a mechanism to protect many objects with the same `RwLock` that only needs to be acquired once. In Stylo, there is one such lock per process (in a `lazy_static`), used for everything. I non-Stylo Servo, I originally intended to have one such lock per document (for author-origin stylesheets, and one per process for user-agent and user sytlesheets since they’re shared across documents, and never mutated anyway). However I failed to have the same document-specific (or pipeline-specific) `Arc` reachable from both `Document` nodes and `LayoutThread`. Recursively following callers lead me to include this `Arc` in `UnprivilegedPipelineContent`, but that needs to be serializable. So there is a second process-wide lock. This was previously #15998, closed accidentally. --- <!-- 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. --> Source-Repo: https://github.com/servo/servo Source-Revision: bb54f0a429de0e8b8861f8071b6cf82f73622664 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 851230e57ac8775707df5f0f103be5feac81fc41
69 lines
2.4 KiB
Rust
69 lines
2.4 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::CSSGroupingRuleBinding::CSSGroupingRuleMethods;
|
|
use dom::bindings::error::{ErrorResult, Fallible};
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::js::{MutNullableJS, Root};
|
|
use dom::bindings::reflector::DomObject;
|
|
use dom::bindings::str::DOMString;
|
|
use dom::cssrule::CSSRule;
|
|
use dom::cssrulelist::{CSSRuleList, RulesSource};
|
|
use dom::cssstylesheet::CSSStyleSheet;
|
|
use dom_struct::dom_struct;
|
|
use std::sync::Arc;
|
|
use style::shared_lock::{SharedRwLock, Locked};
|
|
use style::stylesheets::CssRules as StyleCssRules;
|
|
|
|
#[dom_struct]
|
|
pub struct CSSGroupingRule {
|
|
cssrule: CSSRule,
|
|
#[ignore_heap_size_of = "Arc"]
|
|
rules: Arc<Locked<StyleCssRules>>,
|
|
rulelist: MutNullableJS<CSSRuleList>,
|
|
}
|
|
|
|
impl CSSGroupingRule {
|
|
pub fn new_inherited(parent_stylesheet: &CSSStyleSheet,
|
|
rules: Arc<Locked<StyleCssRules>>) -> CSSGroupingRule {
|
|
CSSGroupingRule {
|
|
cssrule: CSSRule::new_inherited(parent_stylesheet),
|
|
rules: rules,
|
|
rulelist: MutNullableJS::new(None),
|
|
}
|
|
}
|
|
|
|
fn rulelist(&self) -> Root<CSSRuleList> {
|
|
let parent_stylesheet = self.upcast::<CSSRule>().parent_stylesheet();
|
|
self.rulelist.or_init(|| CSSRuleList::new(self.global().as_window(),
|
|
parent_stylesheet,
|
|
RulesSource::Rules(self.rules.clone())))
|
|
}
|
|
|
|
pub fn parent_stylesheet(&self) -> &CSSStyleSheet {
|
|
self.cssrule.parent_stylesheet()
|
|
}
|
|
|
|
pub fn shared_lock(&self) -> &SharedRwLock {
|
|
self.cssrule.shared_lock()
|
|
}
|
|
}
|
|
|
|
impl CSSGroupingRuleMethods for CSSGroupingRule {
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-cssrules
|
|
fn CssRules(&self) -> Root<CSSRuleList> {
|
|
// XXXManishearth check origin clean flag
|
|
self.rulelist()
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-insertrule
|
|
fn InsertRule(&self, rule: DOMString, index: u32) -> Fallible<u32> {
|
|
self.rulelist().insert_rule(&rule, index, /* nested */ true)
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-deleterule
|
|
fn DeleteRule(&self, index: u32) -> ErrorResult {
|
|
self.rulelist().remove_rule(index)
|
|
}
|
|
}
|