diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-16 18:32:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-16 18:32:27 -0500 |
| commit | 901fef5fa90f47dfc4cff6827fecf72cb3fda6de (patch) | |
| tree | 0dc78480ab51b56b4d7d05daa9e66d492518d726 /components/script/script_thread.rs | |
| parent | db9430755b742ba714607386858f903a0ecb8b6e (diff) | |
| parent | 8846cda501bd0523a07180b1ea5606a7b8299f1a (diff) | |
| download | servo-901fef5fa90f47dfc4cff6827fecf72cb3fda6de.tar.gz servo-901fef5fa90f47dfc4cff6827fecf72cb3fda6de.zip | |
Auto merge of #24742 - servo:jdm-patch-34, r=asajeffrey
Reduce unnecesarily large borrow in script thread
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24730
- [x] There are tests for these changes
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 43741209fa1..dbc4f0fb444 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -2538,7 +2538,8 @@ impl ScriptThread { source_origin: ImmutableOrigin, data: StructuredSerializedData, ) { - match { self.documents.borrow().find_window(pipeline_id) } { + let window = self.documents.borrow().find_window(pipeline_id); + match window { None => return warn!("postMessage after target pipeline {} closed.", pipeline_id), Some(window) => { // FIXME: synchronously talks to constellation. @@ -2621,7 +2622,8 @@ impl ScriptThread { history_state_id: Option<HistoryStateId>, url: ServoUrl, ) { - match { self.documents.borrow().find_window(pipeline_id) } { + let window = self.documents.borrow().find_window(pipeline_id); + match window { None => { return warn!( "update history state after pipeline {} closed.", @@ -2637,7 +2639,8 @@ impl ScriptThread { pipeline_id: PipelineId, history_states: Vec<HistoryStateId>, ) { - match { self.documents.borrow().find_window(pipeline_id) } { + let window = self.documents.borrow().find_window(pipeline_id); + match window { None => { return warn!( "update history state after pipeline {} closed.", |