aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorJames Graham <james@hoppipolla.co.uk>2015-05-11 14:47:10 +0100
committerJames Graham <james@hoppipolla.co.uk>2015-06-01 23:18:55 +0100
commit49f1b13ad968467e442d9bc7bc1ee737365e1f5d (patch)
tree6459e79dab04095889035a8aad9b7d933f294077 /components/script/script_task.rs
parentc724444ccb85551b5a0a581d673875ec9bce3d1f (diff)
downloadservo-49f1b13ad968467e442d9bc7bc1ee737365e1f5d.tar.gz
servo-49f1b13ad968467e442d9bc7bc1ee737365e1f5d.zip
Add support for switching frames with the webdriver API.
This moves webdriver_traits into msg to avoid a circular dependency.
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index ff13cc12ff0..1d7b65ba1b4 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -62,12 +62,12 @@ use script_traits::CompositorEvent::{MouseMoveEvent, KeyEvent};
use script_traits::{NewLayoutInfo, OpaqueScriptLayoutChannel};
use script_traits::{ConstellationControlMsg, ScriptControlChan};
use script_traits::{ScriptState, ScriptTaskFactory};
-use webdriver_traits::WebDriverScriptCommand;
use msg::compositor_msg::{LayerId, ScriptListener};
use msg::constellation_msg::{ConstellationChan, FocusType};
use msg::constellation_msg::{LoadData, PipelineId, SubpageId, MozBrowserEvent, WorkerId};
use msg::constellation_msg::{Failure, WindowSizeData, PipelineExitType};
use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::webdriver_msg::WebDriverScriptCommand;
use net_traits::{ResourceTask, LoadConsumer, ControlMsg, Metadata};
use net_traits::LoadData as NetLoadData;
use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask, ImageCacheResult};
@@ -835,6 +835,8 @@ impl ScriptTask {
webdriver_handlers::handle_get_name(&page, pipeline_id, node_id, reply),
WebDriverScriptCommand::GetElementText(node_id, reply) =>
webdriver_handlers::handle_get_text(&page, pipeline_id, node_id, reply),
+ WebDriverScriptCommand::GetFrameId(frame_id, reply) =>
+ webdriver_handlers::handle_get_frame_id(&page, pipeline_id, frame_id, reply),
WebDriverScriptCommand::GetTitle(reply) =>
webdriver_handlers::handle_get_title(&page, pipeline_id, reply),
WebDriverScriptCommand::ExecuteAsyncScript(script, reply) =>