diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-19 17:47:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-19 17:47:27 -0400 |
commit | df2adebefdfa3da49f173e480fa1e56450f9bda2 (patch) | |
tree | 1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/cssviewportrule.rs | |
parent | 2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff) | |
parent | c37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff) | |
download | servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip |
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component
---
<!-- 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 part of #21373.
- [x] These changes do not require tests because they format code only.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- 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/21737)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/cssviewportrule.rs')
-rw-r--r-- | components/script/dom/cssviewportrule.rs | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/components/script/dom/cssviewportrule.rs b/components/script/dom/cssviewportrule.rs index 89e523cdc39..8f0dbaa8c15 100644 --- a/components/script/dom/cssviewportrule.rs +++ b/components/script/dom/cssviewportrule.rs @@ -22,7 +22,10 @@ pub struct CSSViewportRule { } impl CSSViewportRule { - fn new_inherited(parent_stylesheet: &CSSStyleSheet, viewportrule: Arc<Locked<ViewportRule>>) -> CSSViewportRule { + fn new_inherited( + parent_stylesheet: &CSSStyleSheet, + viewportrule: Arc<Locked<ViewportRule>>, + ) -> CSSViewportRule { CSSViewportRule { cssrule: CSSRule::new_inherited(parent_stylesheet), viewportrule: viewportrule, @@ -30,11 +33,19 @@ impl CSSViewportRule { } #[allow(unrooted_must_root)] - pub fn new(window: &Window, parent_stylesheet: &CSSStyleSheet, - viewportrule: Arc<Locked<ViewportRule>>) -> DomRoot<CSSViewportRule> { - reflect_dom_object(Box::new(CSSViewportRule::new_inherited(parent_stylesheet, viewportrule)), - window, - CSSViewportRuleBinding::Wrap) + pub fn new( + window: &Window, + parent_stylesheet: &CSSStyleSheet, + viewportrule: Arc<Locked<ViewportRule>>, + ) -> DomRoot<CSSViewportRule> { + reflect_dom_object( + Box::new(CSSViewportRule::new_inherited( + parent_stylesheet, + viewportrule, + )), + window, + CSSViewportRuleBinding::Wrap, + ) } } @@ -46,6 +57,9 @@ impl SpecificCSSRule for CSSViewportRule { fn get_css(&self) -> DOMString { let guard = self.cssrule.shared_lock().read(); - self.viewportrule.read_with(&guard).to_css_string(&guard).into() + self.viewportrule + .read_with(&guard) + .to_css_string(&guard) + .into() } } |