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

Auto merge of #10257 - slayerjain:first_bug, r=KiChjang

Browse source 
Fixes #10141.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10257)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-10 00:39:51 +05:30
commit c33bf4987a
9 changed files with 6 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2423,8 +2423,8 @@ impl DocumentMethods for Document {
}
// https://html.spec.whatwg.org/multipage/#dom-document-location
fn Location(&self) -> Root<Location> {
self.location.or_init(|| Location::new(&self.window))
fn GetLocation(&self) -> Option<Root<Location>> {
self.browsing_context().map(|_| self.location.or_init(|| Location::new(&self.window)))
}
// https://dom.spec.whatwg.org/#dom-parentnode-children
@ -2777,4 +2777,3 @@ pub enum FocusEventType {
Focus, // Element gained focus. Doesn't bubble.
Blur, // Element lost focus. Doesn't bubble.
}

2
components/script/dom/webidls/Document.webidl
View file

@ -81,7 +81,7 @@ enum DocumentReadyState { "loading", "interactive", "complete" };
partial /*sealed*/ interface Document {
// resource metadata management
[/*PutForwards=href, */Unforgeable]
readonly attribute Location/*?*/ location;
readonly attribute Location? location;
readonly attribute DOMString domain;
// readonly attribute DOMString referrer;
[Throws]

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

@ -441,7 +441,7 @@ impl WindowMethods for Window {
// https://html.spec.whatwg.org/multipage/#dom-location
fn Location(&self) -> Root<Location> {
self.Document().Location()
self.Document().GetLocation().unwrap()
}
// https://html.spec.whatwg.org/multipage/#dom-sessionstorage

4
components/script/dom/xmldocument.rs
View file

@ -76,8 +76,8 @@ impl XMLDocument {
impl XMLDocumentMethods for XMLDocument {
// https://html.spec.whatwg.org/multipage/#dom-document-location
fn Location(&self) -> Root<Location> {
self.document.Location()
fn GetLocation(&self) -> Option<Root<Location>> {
self.document.GetLocation()
}
// https://html.spec.whatwg.org/multipage/#dom-tree-accessors:supported-property-names

3
tests/wpt/metadata/XMLHttpRequest/responsexml-document-properties.htm.ini
View file

@ -9,9 +9,6 @@
[readyState]
expected: FAIL
[location]
expected: FAIL
[defaultView]
expected: FAIL

4
tests/wpt/metadata/domparsing/DOMParser-parseFromString-html.html.ini
View file

@ -1,5 +1 @@
[DOMParser-parseFromString-html.html]
type: testharness
[Location value]
expected: FAIL

3
tests/wpt/metadata/domparsing/DOMParser-parseFromString-xml.html.ini
View file

@ -1,9 +1,6 @@
[DOMParser-parseFromString-xml.html]
type: testharness
expected: TIMEOUT
[Should parse correctly in type text/xml]
expected: FAIL
[Should return an error document for XML wellformedness errors in type text/xml]
expected: FAIL

5
tests/wpt/metadata/html/browsers/history/the-location-interface/document_location.html.ini
View file

@ -1,5 +0,0 @@
[document_location.html]
type: testharness
[document not in a browsing context]
expected: FAIL

5
tests/wpt/mozilla/meta/mozilla/windowproxy.html.ini
View file

@ -1,5 +0,0 @@
[windowproxy.html]
type: testharness
[document.location is the right thing on non-rendered document]
expected: FAIL