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

Push the url parsing out of Window::load_url.

Browse source 
This will allow the two callers to decide on the base url independently.
This commit is contained in:
Ms2ger 2015-08-07 15:19:16 +02:00
parent ec9f79067d
commit 40b5c4586e
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/document.rs
View file

@ -86,7 +86,7 @@ use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks};
use ipc_channel::ipc; use ipc_channel::ipc;
use layout_interface::{LayoutChan, Msg}; use layout_interface::{LayoutChan, Msg};
use string_cache::{Atom, QualName}; use string_cache::{Atom, QualName};
use url::Url; use url::{Url, UrlParser};
use js::jsapi::{JSContext, JSObject, JSRuntime}; use js::jsapi::{JSContext, JSObject, JSRuntime};
use num::ToPrimitive; use num::ToPrimitive;
@ -466,7 +466,11 @@ impl<'a> DocumentHelpers<'a> for &'a Document {
fn load_anchor_href(self, href: DOMString) { fn load_anchor_href(self, href: DOMString) {
let window = self.window.root(); let window = self.window.root();
window.r().load_url(href); let base_url = window.get_url();
let url = UrlParser::new().base_url(&base_url).parse(&href);
// FIXME: handle URL parse errors more gracefully.
let url = url.unwrap();
window.load_url(url);
} }
/// Attempt to find a named element in this page's document. /// Attempt to find a named element in this page's document.

11
components/script/dom/location.rs
View file

@ -13,7 +13,7 @@ use dom::window::Window;
use dom::window::WindowHelpers; use dom::window::WindowHelpers;
use util::str::DOMString; use util::str::DOMString;
use url::Url; use url::{Url, UrlParser};
#[dom_struct] #[dom_struct]
pub struct Location { pub struct Location {
@ -39,7 +39,14 @@ impl Location {
impl<'a> LocationMethods for &'a Location { impl<'a> LocationMethods for &'a Location {
// https://html.spec.whatwg.org/multipage/#dom-location-assign // https://html.spec.whatwg.org/multipage/#dom-location-assign
fn Assign(self, url: DOMString) { fn Assign(self, url: DOMString) {
self.window.root().r().load_url(url); let window = self.window.root();
// TODO: per spec, we should use the _API base URL_ specified by the
// _entry settings object_.
let base_url = window.get_url();
let url = UrlParser::new().base_url(&base_url).parse(&url);
// FIXME: handle URL parse errors more gracefully.
let url = url.unwrap();
window.load_url(url);
} }
// https://url.spec.whatwg.org/#dom-urlutils-hash // https://url.spec.whatwg.org/#dom-urlutils-hash

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

@ -62,7 +62,7 @@ use js::jsapi::{JS_GC, JS_GetRuntime, JSAutoCompartment, JSAutoRequest};
use js::rust::Runtime; use js::rust::Runtime;
use js::rust::CompileOptionsWrapper; use js::rust::CompileOptionsWrapper;
use selectors::parser::PseudoElement; use selectors::parser::PseudoElement;
use url::{Url, UrlParser}; use url::Url;
use libc; use libc;
use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD}; use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD};
@ -594,7 +594,7 @@ impl<'a> WindowMethods for &'a Window {
pub trait WindowHelpers { pub trait WindowHelpers {
fn clear_js_runtime(self); fn clear_js_runtime(self);
fn init_browsing_context(self, doc: &Document, frame_element: Option<&Element>); fn init_browsing_context(self, doc: &Document, frame_element: Option<&Element>);
fn load_url(self, href: DOMString); fn load_url(self, url: Url);
fn handle_fire_timer(self, timer_id: TimerId); fn handle_fire_timer(self, timer_id: TimerId);
fn force_reflow(self, goal: ReflowGoal, query_type: ReflowQueryType, reason: ReflowReason); fn force_reflow(self, goal: ReflowGoal, query_type: ReflowQueryType, reason: ReflowReason);
fn reflow(self, goal: ReflowGoal, query_type: ReflowQueryType, reason: ReflowReason); fn reflow(self, goal: ReflowGoal, query_type: ReflowQueryType, reason: ReflowReason);
@ -890,12 +890,7 @@ impl<'a> WindowHelpers for &'a Window {
} }
/// Commence a new URL load which will either replace this window or scroll to a fragment. /// Commence a new URL load which will either replace this window or scroll to a fragment.
fn load_url(self, href: DOMString) { fn load_url(self, url: Url) {
let base_url = self.get_url();
debug!("current page url is {}", base_url);
let url = UrlParser::new().base_url(&base_url).parse(&href);
// FIXME: handle URL parse errors more gracefully.
let url = url.unwrap();
match url.fragment { match url.fragment {
Some(fragment) => { Some(fragment) => {
self.script_chan.send(ScriptMsg::TriggerFragment(self.id, fragment)).unwrap(); self.script_chan.send(ScriptMsg::TriggerFragment(self.id, fragment)).unwrap();