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

Formatted code

Browse source
This commit is contained in:
hundredeir 2019-04-06 23:40:01 +05:30
parent 816e599db3
commit a00b5b2053
3 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/script_thread.rs
View file

@ -1872,7 +1872,7 @@ impl ScriptThread {
reply,
)
},
WebDriverScriptCommand::FindElementElementsCSS(selector,element_id,reply) => {
WebDriverScriptCommand::FindElementElementsCSS(selector, element_id, reply) => {
webdriver_handlers::handle_find_element_elements_css(
&*documents,
pipeline_id,

9
components/script/webdriver_handlers.rs
View file

@ -226,11 +226,12 @@ pub fn handle_find_element_elements_css(
element_id: String,
selector: String,
reply: IpcSender<Result<Option<String>, ()>>,
){
let node_ids = find_node_by_unique_id(documents,pipeline,element_id)
) {
let node_ids = find_node_by_unique_id(documents, pipeline, element_id)
.ok_or(())
.and_then(|node|{
node.query_selector_all(DOMString::from(selector)).map_err(|_| ())
.and_then(|node| {
node.query_selector_all(DOMString::from(selector))
.map_err(|_| ())
})
.map(|nodes| {
nodes

32
components/webdriver_server/lib.rs
View file

@ -803,36 +803,42 @@ impl Handler {
}
}
// https://w3c.github.io/webdriver/#find-elements-from-element
fn handle_find_element_elements(&self,
element: &WebElement, parameters: &LocatorParameters
) -> WebDriverResult<WebDriverResponse>{
fn handle_find_element_elements(
&self,
element: &WebElement,
parameters: &LocatorParameters,
) -> WebDriverResult<WebDriverResponse> {
if parameters.using != LocatorStrategy::CSSSelector {
return Err(WebDriverError::new(
ErrorStatus::UnsupportedOperation,
"Unsupported locator strategy"
"Unsupported locator strategy",
));
}
let (sender,receiver) = ipc::channel().unwrap();
let (sender, receiver) = ipc::channel().unwrap();
let cmd = WebDriverScriptCommand::FindElementElementsCSS(
parameters.value.clone(),element.id.clone(),sender);
parameters.value.clone(),
element.id.clone(),
sender,
);
self.browsing_context_script_command(cmd)?;
match receiver.recv().unwrap(){
match receiver.recv().unwrap() {
Ok(value) => {
let value_resp = value.into_iter() //maybe into_iter is superfluous
.map(|x| serde_json::to_value(WebElement::new(x)) .unwrap())
let value_resp = value
.into_iter()
.map(|x| serde_json::to_value(WebElement::new(x)).unwrap())
.collect::<Vec<Value>>();
let value_resp = serde_json::to_value(value_resp).unwrap();
Ok(WebDriverResponse::Generic(ValueResponse(value_resp)))
},
Err(_) => Err(WebDriverError::new(
ErrorStatus::InvalidSelector,"Invalid Selector",))
ErrorStatus::InvalidSelector,
"Invalid Selector",
)),
}
}
// https://w3c.github.io/webdriver/webdriver-spec.html#get-element-rect
@ -1274,7 +1280,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
WebDriverCommand::FindElementElement(ref element, ref parameters) => {
self.handle_find_element_element(element, parameters)
},
WebDriverCommand::FindElementElements(ref element,ref parameters) => {
WebDriverCommand::FindElementElements(ref element, ref parameters) => {
self.handle_find_element_elements(element, parameters)
},
WebDriverCommand::GetNamedCookie(ref name) => self.handle_get_cookie(name),