diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-16 17:54:50 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-16 17:54:50 -0600 |
| commit | 1092ca10192c79b4b96c25985a2c6245d369090b (patch) | |
| tree | d760bf3ad5309c910b9f4e0f5518403a2fbf2e8b /components/script_traits/lib.rs | |
| parent | 0888a3a16d4f5eafe4f8008ec060764645f3bee5 (diff) | |
| parent | 939a89568e9506c2c6ffbd1f49e3acda6acdf370 (diff) | |
| download | servo-1092ca10192c79b4b96c25985a2c6245d369090b.tar.gz servo-1092ca10192c79b4b96c25985a2c6245d369090b.zip | |
auto merge of #5205 : glennw/servo/iframe-nav, r=jdm
The history is now recorded per frame, but needs to be exposed in a followup PR.
Diffstat (limited to 'components/script_traits/lib.rs')
| -rw-r--r-- | components/script_traits/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index deb5ba30770..05ed3f25097 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -44,7 +44,7 @@ pub struct UntrustedNodeAddress(pub *const c_void); unsafe impl Send for UntrustedNodeAddress {} pub struct NewLayoutInfo { - pub old_pipeline_id: PipelineId, + pub containing_pipeline_id: PipelineId, pub new_pipeline_id: PipelineId, pub subpage_id: SubpageId, pub layout_chan: Box<Any+Send>, // opaque reference to a LayoutChannel @@ -53,8 +53,6 @@ pub struct NewLayoutInfo { /// Messages sent from the constellation to the script task pub enum ConstellationControlMsg { - /// Reactivate an existing pipeline. - Activate(PipelineId), /// Gives a channel and ID to a layout task, as well as the ID of that layout's parent AttachLayout(NewLayoutInfo), /// Window resized. Sends a DOM event eventually, but first we combine events. @@ -74,7 +72,9 @@ pub enum ConstellationControlMsg { /// Notifies script task to suspend all its timers Freeze(PipelineId), /// Notifies script task to resume all its timers - Thaw(PipelineId) + Thaw(PipelineId), + /// Notifies script task that a url should be loaded in this iframe. + Navigate(PipelineId, SubpageId, LoadData), } unsafe impl Send for ConstellationControlMsg { @@ -112,7 +112,7 @@ pub trait ScriptTaskFactory { storage_task: StorageTask, image_cache_task: ImageCacheTask, devtools_chan: Option<DevtoolsControlChan>, - window_size: WindowSizeData, + window_size: Option<WindowSizeData>, load_data: LoadData) where C: ScriptListener + Send; fn create_layout_channel(_phantom: Option<&mut Self>) -> OpaqueScriptLayoutChannel; |