Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
According to the doc: https://html.spec.whatwg.org/multipage/web-sockets.html#network The task source for all tasks queued in the websocket section are the websocket task source, so this commit also updates those references to use the appropriate one.
- Loading branch information
Agustin Chiappe Berrini
committed
Sep 8, 2018
1 parent
f7630da
commit 5dd6e21
Showing
7 changed files
with
82 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/* 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 msg::constellation_msg::PipelineId; | ||
use script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; | ||
use task::{TaskCanceller, TaskOnce}; | ||
use task_source::{TaskSource, TaskSourceName}; | ||
|
||
#[derive(JSTraceable)] | ||
pub struct WebsocketTaskSource(pub Box<ScriptChan + Send + 'static>, pub PipelineId); | ||
|
||
impl Clone for WebsocketTaskSource { | ||
fn clone(&self) -> WebsocketTaskSource { | ||
WebsocketTaskSource(self.0.clone(), self.1.clone()) | ||
} | ||
} | ||
|
||
impl TaskSource for WebsocketTaskSource { | ||
const NAME: TaskSourceName = TaskSourceName::Websocket; | ||
|
||
fn queue_with_canceller<T>( | ||
&self, | ||
task: T, | ||
canceller: &TaskCanceller, | ||
) -> Result<(), ()> | ||
where | ||
T: TaskOnce + 'static, | ||
{ | ||
self.0.send(CommonScriptMsg::Task( | ||
ScriptThreadEventCategory::NetworkEvent, | ||
Box::new(canceller.wrap_task(task)), | ||
Some(self.1), | ||
WebsocketTaskSource::NAME, | ||
)) | ||
} | ||
} |