aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/workletglobalscope.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-09-19 17:47:27 -0400
committerGitHub <noreply@github.com>2018-09-19 17:47:27 -0400
commitdf2adebefdfa3da49f173e480fa1e56450f9bda2 (patch)
tree1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/workletglobalscope.rs
parent2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff)
parentc37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff)
downloadservo-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/workletglobalscope.rs')
-rw-r--r--components/script/dom/workletglobalscope.rs47
1 files changed, 26 insertions, 21 deletions
diff --git a/components/script/dom/workletglobalscope.rs b/components/script/dom/workletglobalscope.rs
index 6a3dc033aad..4a352535893 100644
--- a/components/script/dom/workletglobalscope.rs
+++ b/components/script/dom/workletglobalscope.rs
@@ -88,24 +88,19 @@ impl WorkletGlobalScope {
pub fn evaluate_js(&self, script: &str) -> bool {
debug!("Evaluating Dom.");
rooted!(in (self.globalscope.get_cx()) let mut rval = UndefinedValue());
- self.globalscope.evaluate_js_on_global_with_result(&*script, rval.handle_mut())
+ self.globalscope
+ .evaluate_js_on_global_with_result(&*script, rval.handle_mut())
}
/// Register a paint worklet to the script thread.
- pub fn register_paint_worklet(
- &self,
- name: Atom,
- properties: Vec<Atom>,
- painter: Box<Painter>,
- ) {
+ pub fn register_paint_worklet(&self, name: Atom, properties: Vec<Atom>, painter: Box<Painter>) {
self.to_script_thread_sender
.send(MainThreadScriptMsg::RegisterPaintWorklet {
pipeline_id: self.globalscope.pipeline_id(),
name,
properties,
painter,
- })
- .expect("Worklet thread outlived script thread.");
+ }).expect("Worklet thread outlived script thread.");
}
/// The base URL of this global.
@@ -165,19 +160,29 @@ pub enum WorkletGlobalScopeType {
impl WorkletGlobalScopeType {
/// Create a new heap-allocated `WorkletGlobalScope`.
- pub fn new(&self,
- runtime: &Runtime,
- pipeline_id: PipelineId,
- base_url: ServoUrl,
- executor: WorkletExecutor,
- init: &WorkletGlobalScopeInit)
- -> DomRoot<WorkletGlobalScope>
- {
+ pub fn new(
+ &self,
+ runtime: &Runtime,
+ pipeline_id: PipelineId,
+ base_url: ServoUrl,
+ executor: WorkletExecutor,
+ init: &WorkletGlobalScopeInit,
+ ) -> DomRoot<WorkletGlobalScope> {
match *self {
- WorkletGlobalScopeType::Test =>
- DomRoot::upcast(TestWorkletGlobalScope::new(runtime, pipeline_id, base_url, executor, init)),
- WorkletGlobalScopeType::Paint =>
- DomRoot::upcast(PaintWorkletGlobalScope::new(runtime, pipeline_id, base_url, executor, init)),
+ WorkletGlobalScopeType::Test => DomRoot::upcast(TestWorkletGlobalScope::new(
+ runtime,
+ pipeline_id,
+ base_url,
+ executor,
+ init,
+ )),
+ WorkletGlobalScopeType::Paint => DomRoot::upcast(PaintWorkletGlobalScope::new(
+ runtime,
+ pipeline_id,
+ base_url,
+ executor,
+ init,
+ )),
}
}
}