diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-06-17 10:16:27 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-06-17 10:16:27 -0600 |
| commit | ee54c89e3f801dcd90a494c65ff8cfd975a6be6f (patch) | |
| tree | a7b7155e02ca6d7c1c852cd01ba025f13fd68191 /components/msg/constellation_msg.rs | |
| parent | ee22ae263515c2804b739ead4c02bc7333c3965c (diff) | |
| parent | 22c06307b8a55ae3ce7393d9770918f74ac5e0d8 (diff) | |
| download | servo-ee54c89e3f801dcd90a494c65ff8cfd975a6be6f.tar.gz servo-ee54c89e3f801dcd90a494c65ff8cfd975a6be6f.zip | |
Auto merge of #6401 - jgraham:load_timeout, r=metajack
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6401)
<!-- Reviewable:end -->
Diffstat (limited to 'components/msg/constellation_msg.rs')
| -rw-r--r-- | components/msg/constellation_msg.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index c8d5bf0ceb2..16a68dc7532 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -19,7 +19,7 @@ use std::collections::HashMap; use std::sync::mpsc::{channel, Sender, Receiver}; use style::viewport::ViewportConstraints; use url::Url; -use webdriver_msg::{WebDriverScriptCommand, LoadComplete}; +use webdriver_msg::{WebDriverScriptCommand, LoadStatus}; #[derive(Clone)] pub struct ConstellationChan(pub Sender<Msg>); @@ -328,7 +328,7 @@ impl MozBrowserEvent { } pub enum WebDriverCommandMsg { - LoadUrl(PipelineId, LoadData, Sender<LoadComplete>), + LoadUrl(PipelineId, LoadData, Sender<LoadStatus>), ScriptCommand(PipelineId, WebDriverScriptCommand), TakeScreenshot(PipelineId, Sender<Option<png::Image>>) } |