Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove webdriver use of SubpageId

Browse source
This commit is contained in:
Glenn Watson 2015-10-14 10:22:29 +10:00
parent bc58cd2de0
commit ed72e5766b
5 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/webdriver_handlers.rs
View file

@ -17,7 +17,7 @@ use ipc_channel::ipc::IpcSender;
use js::jsapi::JSContext;
use js::jsapi::{HandleValue, RootedValue};
use js::jsval::UndefinedValue;
use msg::constellation_msg::{PipelineId, SubpageId};
use msg::constellation_msg::PipelineId;
use msg::webdriver_msg::{WebDriverFrameId, WebDriverJSError, WebDriverJSResult, WebDriverJSValue};
use page::Page;
use script_task::get_page;
@ -85,7 +85,7 @@ pub fn handle_execute_async_script(page: &Rc<Page>,
pub fn handle_get_frame_id(page: &Rc<Page>,
pipeline: PipelineId,
webdriver_frame_id: WebDriverFrameId,
reply: IpcSender<Result<Option<(PipelineId, SubpageId)>, ()>>) {
reply: IpcSender<Result<Option<PipelineId>, ()>>) {
let window = match webdriver_frame_id {
WebDriverFrameId::Short(_) => {
// This isn't supported yet
@ -108,7 +108,7 @@ pub fn handle_get_frame_id(page: &Rc<Page>,
}
};
let frame_id = window.map(|x| x.and_then(|x| x.r().parent_info()));
let frame_id = window.map(|x| x.map(|x| x.r().pipeline()));
reply.send(frame_id).unwrap()
}