aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorGuillaume Bort <guillaume.bort@gmail.com>2014-11-19 12:06:36 +0100
committerGuillaume Bort <guillaume.bort@gmail.com>2015-01-07 11:39:15 +0100
commit5fe3a3e54f2d94c33ca84c54521aab4bd6b98c1e (patch)
treeb00df282e3464c87308642eb6e765762418ba09c /components/script/script_task.rs
parentca876edc051c9b105747252155d0f11c31189646 (diff)
downloadservo-5fe3a3e54f2d94c33ca84c54521aab4bd6b98c1e.tar.gz
servo-5fe3a3e54f2d94c33ca84c54521aab4bd6b98c1e.zip
Fix #3936 – {Window,WorkerGlobalScope}.set{Timeout,Interval}(DOMString)
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 88e6ed860a5..1a3767664dd 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -27,7 +27,7 @@ use dom::htmlelement::HTMLElementTypeId;
use dom::keyboardevent::KeyboardEvent;
use dom::mouseevent::MouseEvent;
use dom::node::{mod, Node, NodeHelpers, NodeDamage, NodeTypeId};
-use dom::window::{Window, WindowHelpers};
+use dom::window::{Window, WindowHelpers, ScriptHelpers};
use parse::html::{HTMLInput, parse_html};
use layout_interface::{ScriptLayoutChan, LayoutChan, ReflowGoal, ReflowQueryType};
use layout_interface;
@@ -836,7 +836,7 @@ impl ScriptTask {
(HTMLInput::InputUrl(load_response), final_url)
} else {
let evalstr = load_data.url.non_relative_scheme_data().unwrap();
- let jsval = window.r().evaluate_js_with_result(evalstr);
+ let jsval = window.r().evaluate_js_on_global_with_result(evalstr);
let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval,
StringificationBehavior::Empty);
(HTMLInput::InputString(strval.unwrap_or("".into_string())), doc_url)