diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-22 21:36:51 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-22 21:36:51 -0600 |
| commit | 1f682d878db99651bfd26b8a28b57895f2238f87 (patch) | |
| tree | c74936efd24415d3603b9658b21f4aee44c68a9b /components/script_traits/lib.rs | |
| parent | dfb8929b001c8d0fb6d5e63f5a9d6dcc17cb388a (diff) | |
| parent | bf9b8f705019e8d0bb2ff9ff18846b3e81d4b26f (diff) | |
| download | servo-1f682d878db99651bfd26b8a28b57895f2238f87.tar.gz servo-1f682d878db99651bfd26b8a28b57895f2238f87.zip | |
auto merge of #5281 : glennw/servo/mozbrowser, r=jdm
Diffstat (limited to 'components/script_traits/lib.rs')
| -rw-r--r-- | components/script_traits/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 58fa83dbf67..fbd64434b06 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -72,6 +72,8 @@ pub enum ConstellationControlMsg { Thaw(PipelineId), /// Notifies script task that a url should be loaded in this iframe. Navigate(PipelineId, SubpageId, LoadData), + /// Requests the script task forward a mozbrowser event to an iframe it owns + MozBrowserEvent(PipelineId, SubpageId, String, Option<String>), } unsafe impl Send for ConstellationControlMsg { @@ -99,6 +101,7 @@ pub struct ScriptControlChan(pub Sender<ConstellationControlMsg>); pub trait ScriptTaskFactory { fn create<C>(_phantom: Option<&mut Self>, id: PipelineId, + parent_info: Option<(PipelineId, SubpageId)>, compositor: C, layout_chan: &OpaqueScriptLayoutChannel, control_chan: ScriptControlChan, |