Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-30 10:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

Format code and fix rebase errors

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-11-06 18:37:04 +01:00
parent 85ec66b43e
commit 68baabba63
6 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/constellation/constellation.rs
View file

@ -153,8 +153,8 @@ use script_traits::{
IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState, TimerSchedulerMsg, IFrameLoadInfo, IFrameLoadInfoWithData, IFrameSandboxState, TimerSchedulerMsg,
}; };
use script_traits::{LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, ScriptThreadFactory}; use script_traits::{LayoutMsg as FromLayoutMsg, ScriptMsg as FromScriptMsg, ScriptThreadFactory};
use script_traits::{MessagePortMsg, PortMessageTask, StructuredSerializedData};
use script_traits::{MediaSessionActionType, MouseEventType}; use script_traits::{MediaSessionActionType, MouseEventType};
use script_traits::{MessagePortMsg, PortMessageTask, StructuredSerializedData};
use script_traits::{SWManagerMsg, ScopeThings, UpdatePipelineIdReason, WebDriverCommandMsg}; use script_traits::{SWManagerMsg, ScopeThings, UpdatePipelineIdReason, WebDriverCommandMsg};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use servo_config::{opts, pref}; use servo_config::{opts, pref};
@ -475,7 +475,7 @@ pub struct Constellation<Message, LTF, STF> {
/// Mechanism to force the compositor to process events. /// Mechanism to force the compositor to process events.
event_loop_waker: Option<Box<dyn EventLoopWaker>>, event_loop_waker: Option<Box<dyn EventLoopWaker>>,
/// Browing context ID of the active media session. /// Browing context ID of the active media session.
active_media_session: Option<BrowsingContextId>, active_media_session: Option<BrowsingContextId>,
} }

2
components/script/dom/bindings/trace.rs
View file

@ -94,7 +94,7 @@ use profile_traits::time::ProfilerChan as TimeProfilerChan;
use script_layout_interface::rpc::LayoutRPC; use script_layout_interface::rpc::LayoutRPC;
use script_layout_interface::OpaqueStyleAndLayoutData; use script_layout_interface::OpaqueStyleAndLayoutData;
use script_traits::transferable::MessagePortImpl; use script_traits::transferable::MessagePortImpl;
use script_traits::{DocumentActivity, DrawAPaintImageResult; use script_traits::{DocumentActivity, DrawAPaintImageResult};
use script_traits::{MediaSessionActionType, ScriptToConstellationChan, TimerEventId, TimerSource}; use script_traits::{MediaSessionActionType, ScriptToConstellationChan, TimerEventId, TimerSource};
use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType}; use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType};
use selectors::matching::ElementSelectorFlags; use selectors::matching::ElementSelectorFlags;

1
components/script_traits/lib.rs
View file

@ -1058,6 +1058,7 @@ pub enum MessagePortMsg {
RemoveMessagePort(MessagePortId), RemoveMessagePort(MessagePortId),
/// Handle a new port-message-task. /// Handle a new port-message-task.
NewTask(MessagePortId, PortMessageTask), NewTask(MessagePortId, PortMessageTask),
}
/// The type of MediaSession action. /// The type of MediaSession action.
/// https://w3c.github.io/mediasession/#enumdef-mediasessionaction /// https://w3c.github.io/mediasession/#enumdef-mediasessionaction

4
components/script_traits/script_msg.rs
View file

@ -8,7 +8,6 @@ use crate::DocumentState;
use crate::IFrameLoadInfoWithData; use crate::IFrameLoadInfoWithData;
use crate::LayoutControlMsg; use crate::LayoutControlMsg;
use crate::LoadData; use crate::LoadData;
use crate::MediaSessionEvent;
use crate::MessagePortMsg; use crate::MessagePortMsg;
use crate::PortMessageTask; use crate::PortMessageTask;
use crate::StructuredSerializedData; use crate::StructuredSerializedData;
@ -255,6 +254,9 @@ pub enum ScriptMsg {
GetScreenSize(IpcSender<DeviceIntSize>), GetScreenSize(IpcSender<DeviceIntSize>),
/// Get the available screen size (pixel) /// Get the available screen size (pixel)
GetScreenAvailSize(IpcSender<DeviceIntSize>), GetScreenAvailSize(IpcSender<DeviceIntSize>),
/// Notifies the constellation about media session events
/// (i.e. when there is metadata for the active media session, playback state changes...).
MediaSessionEvent(BrowsingContextId, MediaSessionEvent)
} }
impl fmt::Debug for ScriptMsg { impl fmt::Debug for ScriptMsg {

2
components/servo/lib.rs
View file

@ -270,7 +270,6 @@ pub struct Servo<Window: WindowMethods + 'static + ?Sized> {
embedder_receiver: EmbedderReceiver, embedder_receiver: EmbedderReceiver,
embedder_events: Vec<(Option<BrowserId>, EmbedderMsg)>, embedder_events: Vec<(Option<BrowserId>, EmbedderMsg)>,
profiler_enabled: bool, profiler_enabled: bool,
webgl_thread_data: Option<Rc<WebGLMainThread>>,
} }
#[derive(Clone)] #[derive(Clone)]
@ -556,7 +555,6 @@ where
embedder_receiver: embedder_receiver, embedder_receiver: embedder_receiver,
embedder_events: Vec::new(), embedder_events: Vec::new(),
profiler_enabled: false, profiler_enabled: false,
webgl_thread_data,
} }
} }

3
ports/libsimpleservo/capi/src/lib.rs
View file

@ -17,7 +17,8 @@ use env_logger;
use log::LevelFilter; use log::LevelFilter;
use simpleservo::{self, gl_glue, ServoGlue, SERVO}; use simpleservo::{self, gl_glue, ServoGlue, SERVO};
use simpleservo::{ use simpleservo::{
Coordinates, EventLoopWaker, HostTrait, InitOptions, MediaSessionEvent, MouseButton, VRInitOptions, Coordinates, EventLoopWaker, HostTrait, InitOptions, MediaSessionEvent, MouseButton,
VRInitOptions,
}; };
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]