diff options
author | Alan Jeffrey <ajeffrey@mozilla.com> | 2016-11-10 15:34:04 -0600 |
---|---|---|
committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2016-11-17 18:08:24 -0600 |
commit | c228a4cf03e9ef0b3a08a148f17086bc5e38ee70 (patch) | |
tree | b8673ea1bcdfab3fb75c1e68222786118cdce2d8 /components/script_traits/script_msg.rs | |
parent | 22aebdf5d41a3509cd6515ccf5edcdf33715a76d (diff) | |
download | servo-c228a4cf03e9ef0b3a08a148f17086bc5e38ee70.tar.gz servo-c228a4cf03e9ef0b3a08a148f17086bc5e38ee70.zip |
Report errors using the top-level frame id rather than the pipeline id.
Diffstat (limited to 'components/script_traits/script_msg.rs')
-rw-r--r-- | components/script_traits/script_msg.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index 61c64bbc750..d4a9fc7442b 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -15,8 +15,8 @@ use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; use euclid::point::Point2D; use euclid::size::Size2D; use ipc_channel::ipc::IpcSender; +use msg::constellation_msg::{FrameId, PipelineId, TraversalDirection}; use msg::constellation_msg::{Key, KeyModifiers, KeyState}; -use msg::constellation_msg::{PipelineId, TraversalDirection}; use net_traits::CoreResourceMsg; use net_traits::storage_thread::StorageType; use offscreen_gl_context::{GLContextAttributes, GLLimits}; @@ -131,8 +131,8 @@ pub enum ScriptMsg { ResizeTo(Size2D<u32>), /// Script has handled a touch event, and either prevented or allowed default actions. TouchEventProcessed(EventResult), - /// A log entry, with the pipeline id and thread name - LogEntry(Option<PipelineId>, Option<String>, LogEntry), + /// A log entry, with the top-level frame id and thread name + LogEntry(Option<FrameId>, Option<String>, LogEntry), /// Notifies the constellation that this pipeline has exited. PipelineExited(PipelineId), /// Send messages from postMessage calls from serviceworker |