diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2017-08-16 23:23:18 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-08-16 23:23:18 +0200 |
| commit | 676f2c8acf6fec8ad77d4daa51bef5bdcae101c5 (patch) | |
| tree | d212209744e3b10a315dc79da754a70d7543e428 /components/script_traits/lib.rs | |
| parent | 4d10d39e8fe841c5fe2ac58da2daaa13c10c140e (diff) | |
| download | servo-676f2c8acf6fec8ad77d4daa51bef5bdcae101c5.tar.gz servo-676f2c8acf6fec8ad77d4daa51bef5bdcae101c5.zip | |
Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox"
This reverts commit 4d10d39e8fe841c5fe2ac58da2daaa13c10c140e, reversing
changes made to ee94e2b7c0bd327abe8f9545b2a1f792f67a2bdd.
Diffstat (limited to 'components/script_traits/lib.rs')
| -rw-r--r-- | components/script_traits/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 85122d35c3c..4a197e759ff 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -24,7 +24,6 @@ extern crate ipc_channel; extern crate libc; extern crate msg; extern crate net_traits; -extern crate offscreen_gl_context; extern crate profile_traits; extern crate rustc_serialize; #[macro_use] extern crate serde; @@ -39,6 +38,7 @@ mod script_msg; pub mod webdriver_msg; use bluetooth_traits::BluetoothRequest; +use canvas_traits::webgl::WebGLPipeline; use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId}; use euclid::{Size2D, Length, Point2D, Vector2D, Rect, ScaleFactor, TypedSize2D}; use gfx_traits::Epoch; @@ -524,8 +524,10 @@ pub struct InitialScriptState { pub pipeline_namespace_id: PipelineNamespaceId, /// A ping will be sent on this channel once the script thread shuts down. pub content_process_shutdown_chan: IpcSender<()>, + /// A channel to the webgl thread used in this pipeline. + pub webgl_chan: WebGLPipeline, /// A channel to the webvr thread, if available. - pub webvr_thread: Option<IpcSender<WebVRMsg>> + pub webvr_chan: Option<IpcSender<WebVRMsg>> } /// This trait allows creating a `ScriptThread` without depending on the `script` @@ -759,8 +761,6 @@ pub enum ConstellationMsg { Reload(TopLevelBrowsingContextId), /// A log entry, with the top-level browsing context id and thread name LogEntry(Option<TopLevelBrowsingContextId>, Option<String>, LogEntry), - /// Set the WebVR thread channel. - SetWebVRThread(IpcSender<WebVRMsg>), /// Dispatch WebVR events to the subscribed script threads. WebVREvents(Vec<PipelineId>, Vec<WebVREvent>), /// Create a new top level browsing context. |