auto merge of #3626 : Manishearth/servo/form-prep, r=jdm

Framework for form submission
This commit is contained in:
bors-servo 2014-10-09 16:00:34 -06:00
commit 2f9808e130
10 changed files with 75 additions and 35 deletions

View file

@ -24,13 +24,12 @@ extern crate serialize;
use devtools_traits::DevtoolsControlChan;
use libc::c_void;
use servo_msg::constellation_msg::{ConstellationChan, PipelineId, Failure, WindowSizeData};
use servo_msg::constellation_msg::SubpageId;
use servo_msg::constellation_msg::{LoadData, SubpageId};
use servo_msg::compositor_msg::ScriptListener;
use servo_net::image_cache_task::ImageCacheTask;
use servo_net::resource_task::ResourceTask;
use servo_util::smallvec::SmallVec1;
use std::any::Any;
use url::Url;
use geom::point::Point2D;
@ -50,7 +49,7 @@ pub struct NewLayoutInfo {
/// Messages sent from the constellation to the script task
pub enum ConstellationControlMsg {
/// Loads a new URL on the specified pipeline.
LoadMsg(PipelineId, Url),
LoadMsg(PipelineId, LoadData),
/// Gives a channel and ID to a layout task, as well as the ID of that layout's parent
AttachLayoutMsg(NewLayoutInfo),
/// Window resized. Sends a DOM event eventually, but first we combine events.