Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Urlmageddon: Use refcounted urls more often.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-11-16 11:57:39 +01:00
parent f14e7339b5
commit 913c874cb5
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
161 changed files with 1044 additions and 718 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/webdriver_handlers.rs
View file

@ -36,7 +36,7 @@ use net_traits::IpcSend;
use script_thread::Documents;
use script_traits::webdriver_msg::{WebDriverFrameId, WebDriverJSError, WebDriverJSResult, WebDriverJSValue};
use script_traits::webdriver_msg::WebDriverCookieError;
use url::Url;
use servo_url::ServoUrl;
fn find_node_by_unique_id(documents: &Documents,
pipeline: PipelineId,
@ -361,11 +361,11 @@ pub fn handle_get_css(documents: &Documents,
pub fn handle_get_url(documents: &Documents,
pipeline: PipelineId,
reply: IpcSender<Url>) {
reply: IpcSender<ServoUrl>) {
// TODO: Return an error if the pipeline doesn't exist.
let url = documents.find_document(pipeline)
.map(|document| document.url().clone())
.unwrap_or_else(|| Url::parse("about:blank").expect("infallible"));
.unwrap_or_else(|| ServoUrl::parse("about:blank").expect("infallible"));
reply.send(url).unwrap();
}