aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2019-12-19 18:10:42 -0500
committerJosh Matthews <josh@joshmatthews.net>2020-02-24 15:58:58 -0500
commitf02e516f323cf63d4791e8d88f74fe1de9521e8f (patch)
tree1fbd8fdc36815180c452b42f614ea685b764fd8c /components/script/dom/window.rs
parent6aacc9001be072c90bd7e1e554cfda982772cd12 (diff)
downloadservo-f02e516f323cf63d4791e8d88f74fe1de9521e8f.tar.gz
servo-f02e516f323cf63d4791e8d88f74fe1de9521e8f.zip
Remove unnecessary Option.
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index ce290caabf7..358db4a06f9 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1987,7 +1987,7 @@ impl Window {
.task_canceller(TaskSourceName::DOMManipulation)
.wrap_task(task),
),
- self.pipeline_id(),
+ Some(self.pipeline_id()),
TaskSourceName::DOMManipulation,
));
doc.set_url(load_data.url.clone());
@@ -2353,8 +2353,8 @@ impl Window {
unsafe { WindowBinding::Wrap(JSContext::from_ptr(runtime.cx()), win) }
}
- pub fn pipeline_id(&self) -> Option<PipelineId> {
- Some(self.upcast::<GlobalScope>().pipeline_id())
+ pub fn pipeline_id(&self) -> PipelineId {
+ self.upcast::<GlobalScope>().pipeline_id()
}
}
@@ -2485,7 +2485,7 @@ impl Window {
.task_canceller(TaskSourceName::DOMManipulation)
.wrap_task(task),
),
- self.pipeline_id(),
+ Some(self.pipeline_id()),
TaskSourceName::DOMManipulation,
));
}