aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-05-06 10:34:44 -0500
committerbors-servo <metajack+bors@gmail.com>2015-05-06 10:34:44 -0500
commit72c20d8491137a82160e5455c89ff1a42f3767a7 (patch)
treeefb349bdd6ae499b9dbe9fe64db53a3cc62131c6 /components/script
parent9aa801f140d96b33fbbe564ca614dec00bc0cf9d (diff)
parent1576107c45d48473df172807bcdcbfa1a1db7d83 (diff)
downloadservo-72c20d8491137a82160e5455c89ff1a42f3767a7.tar.gz
servo-72c20d8491137a82160e5455c89ff1a42f3767a7.zip
Auto merge of #5962 - jgraham:webdriver_navigation, r=jdm
<!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5962) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/script_task.rs4
-rw-r--r--components/script/webdriver_handlers.rs7
2 files changed, 9 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 534af2e081f..397078fde19 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -791,7 +791,9 @@ impl ScriptTask {
let page = self.root_page();
match msg {
WebDriverScriptCommand::EvaluateJS(script, reply) =>
- webdriver_handlers::handle_evaluate_js(&page, pipeline_id, script, reply)
+ webdriver_handlers::handle_evaluate_js(&page, pipeline_id, script, reply),
+ WebDriverScriptCommand::GetTitle(reply) =>
+ webdriver_handlers::handle_get_title(&page, pipeline_id, reply)
}
}
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index d021c28e38e..f9ff918c60e 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -5,6 +5,7 @@
use webdriver_traits::{EvaluateJSReply};
use dom::bindings::conversions::FromJSValConvertible;
use dom::bindings::conversions::StringificationBehavior;
+use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
use dom::bindings::js::{OptionalRootable, Rootable};
use dom::window::ScriptHelpers;
use dom::document::DocumentHelpers;
@@ -15,7 +16,7 @@ use script_task::get_page;
use std::rc::Rc;
use std::sync::mpsc::Sender;
-pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, reply: Sender<Result<EvaluateJSReply, ()>>){
+pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, reply: Sender<Result<EvaluateJSReply, ()>>) {
let page = get_page(&*page, pipeline);
let window = page.window().root();
let cx = window.r().get_cx();
@@ -36,3 +37,7 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r
Err(())
}).unwrap();
}
+
+pub fn handle_get_title(page: &Rc<Page>, _pipeline: PipelineId, reply: Sender<String>) {
+ reply.send(page.document().root().r().Title()).unwrap();
+}