diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-08 08:48:54 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-08 08:48:54 -0700 |
| commit | df6a7959df69bf98b397f088fc3cf1fad2cc0aaf (patch) | |
| tree | fae7131eb701121982eab0b793730a4c17615ef3 /components/script/devtools.rs | |
| parent | 1d7148c79f9124779a910fd5291c5fa0543b2dae (diff) | |
| parent | 5fe3a3e54f2d94c33ca84c54521aab4bd6b98c1e (diff) | |
| download | servo-df6a7959df69bf98b397f088fc3cf1fad2cc0aaf.tar.gz servo-df6a7959df69bf98b397f088fc3cf1fad2cc0aaf.zip | |
auto merge of #4069 : guillaumebort/servo/fix/3936, r=jdm
Diffstat (limited to 'components/script/devtools.rs')
| -rw-r--r-- | components/script/devtools.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs index ed03130397a..aedff559fe8 100644 --- a/components/script/devtools.rs +++ b/components/script/devtools.rs @@ -12,7 +12,7 @@ use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::DOMRectBinding::{DOMRectMethods}; use dom::bindings::codegen::Bindings::ElementBinding::{ElementMethods}; use dom::node::{Node, NodeHelpers}; -use dom::window::{WindowHelpers}; +use dom::window::{ScriptHelpers}; use dom::element::Element; use dom::document::DocumentHelpers; use page::Page; @@ -26,7 +26,7 @@ pub fn handle_evaluate_js(page: &Rc<Page>, pipeline: PipelineId, eval: String, r let frame = page.frame(); let window = frame.as_ref().unwrap().window.root(); let cx = window.r().get_cx(); - let rval = window.r().evaluate_js_with_result(eval.as_slice()); + let rval = window.r().evaluate_js_on_global_with_result(eval.as_slice()); reply.send(if rval.is_undefined() { devtools_traits::VoidValue |