mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Revert "Auto merge of #17891 - MortimerGoro:webgl_move, r=glennw,emilio"
This reverts commit90f55ea458
, reversing changes made to2e60b27a21
.
This commit is contained in:
parent
ee94e2b7c0
commit
cfe22e3979
54 changed files with 1426 additions and 3154 deletions
|
@ -3,7 +3,6 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use bluetooth_traits::BluetoothRequest;
|
||||
use canvas_traits::webgl::WebGLPipeline;
|
||||
use compositing::CompositionPipeline;
|
||||
use compositing::CompositorProxy;
|
||||
use compositing::compositor_thread::Msg as CompositorMsg;
|
||||
|
@ -172,12 +171,8 @@ pub struct InitialPipelineState {
|
|||
|
||||
/// Whether this pipeline is considered private.
|
||||
pub is_private: bool,
|
||||
|
||||
/// A channel to the webgl thread.
|
||||
pub webgl_chan: WebGLPipeline,
|
||||
|
||||
/// A channel to the webvr thread.
|
||||
pub webvr_chan: Option<IpcSender<WebVRMsg>>,
|
||||
pub webvr_thread: Option<IpcSender<WebVRMsg>>,
|
||||
}
|
||||
|
||||
impl Pipeline {
|
||||
|
@ -275,8 +270,7 @@ impl Pipeline {
|
|||
script_content_process_shutdown_port: script_content_process_shutdown_port,
|
||||
webrender_api_sender: state.webrender_api_sender,
|
||||
webrender_document: state.webrender_document,
|
||||
webgl_chan: state.webgl_chan,
|
||||
webvr_chan: state.webvr_chan,
|
||||
webvr_thread: state.webvr_thread,
|
||||
};
|
||||
|
||||
// Spawn the child process.
|
||||
|
@ -476,8 +470,7 @@ pub struct UnprivilegedPipelineContent {
|
|||
script_content_process_shutdown_port: IpcReceiver<()>,
|
||||
webrender_api_sender: webrender_api::RenderApiSender,
|
||||
webrender_document: webrender_api::DocumentId,
|
||||
webgl_chan: WebGLPipeline,
|
||||
webvr_chan: Option<IpcSender<WebVRMsg>>,
|
||||
webvr_thread: Option<IpcSender<WebVRMsg>>,
|
||||
}
|
||||
|
||||
impl UnprivilegedPipelineContent {
|
||||
|
@ -506,8 +499,7 @@ impl UnprivilegedPipelineContent {
|
|||
window_size: self.window_size,
|
||||
pipeline_namespace_id: self.pipeline_namespace_id,
|
||||
content_process_shutdown_chan: self.script_content_process_shutdown_chan,
|
||||
webgl_chan: self.webgl_chan,
|
||||
webvr_chan: self.webvr_chan,
|
||||
webvr_thread: self.webvr_thread,
|
||||
}, self.load_data.clone());
|
||||
|
||||
LTF::create(self.id,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue