Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add basic support for executeAsyncScript.

Browse source 
This relies on a global webdriverCallback function, which is visible to content.
Obviously that's not a long term solution for a number of reasons, but it allows
us to experiment for now
This commit is contained in:
James Graham 2015-04-29 19:49:38 +01:00
parent 98cb65ca0a
commit 8d10fa1f2d
6 changed files with 96 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/window.rs
View file

@ -35,8 +35,10 @@ use script_task::{TimerSource, ScriptChan, ScriptPort, NonWorkerScriptChan};
use script_task::ScriptMsg;
use script_traits::ScriptControlChan;
use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
use webdriver_handlers::jsval_to_webdriver;
use devtools_traits::{DevtoolsControlChan, TimelineMarker, TimelineMarkerType, TracingMetadata};
use webdriver_traits::EvaluateJSReply;
use msg::compositor_msg::ScriptListener;
use msg::constellation_msg::{LoadData, PipelineId, SubpageId, ConstellationChan, WindowSizeData, WorkerId};
use net_traits::ResourceTask;
@ -166,6 +168,9 @@ pub struct Window {
/// A counter of the number of pending reflows for this window.
pending_reflow_count: Cell<u32>,
/// A channel for communicating results of async scripts back to the webdriver server
webdriver_script_chan: RefCell<Option<Sender<Result<EvaluateJSReply, ()>>>>
}
impl Window {
@ -483,6 +488,17 @@ impl<'a> WindowMethods for JSRef<'a, Window> {
let doc = self.Document().root();
doc.r().cancel_animation_frame(ident);
}
fn WebdriverCallback(self, cx: *mut JSContext, val: JSVal) {
let rv = jsval_to_webdriver(cx, val);
{
let opt_chan = self.webdriver_script_chan.borrow();
if let Some(ref chan) = *opt_chan {
chan.send(rv).unwrap();
}
}
self.set_webdriver_script_chan(None);
}
}
pub trait WindowHelpers {
@ -523,6 +539,7 @@ pub trait WindowHelpers {
fn emit_timeline_marker(self, marker: TimelineMarker);
fn set_devtools_timeline_marker(self, marker: TimelineMarkerType, reply: Sender<TimelineMarker>);
fn drop_devtools_timeline_markers(self);
fn set_webdriver_script_chan(self, chan: Option<Sender<Result<EvaluateJSReply, ()>>>);
}
pub trait ScriptHelpers {
@ -880,6 +897,10 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
self.devtools_markers.borrow_mut().clear();
*self.devtools_marker_sender.borrow_mut() = None;
}
fn set_webdriver_script_chan(self, chan: Option<Sender<Result<EvaluateJSReply, ()>>>) {
*self.webdriver_script_chan.borrow_mut() = chan;
}
}
impl Window {
@ -947,6 +968,7 @@ impl Window {
devtools_marker_sender: RefCell::new(None),
devtools_markers: RefCell::new(HashSet::new()),
devtools_wants_updates: Cell::new(false),
webdriver_script_chan: RefCell::new(None),
};
WindowBinding::Wrap(runtime.cx(), win)