mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Auto merge of #14647 - servo:current-global, r=jdm
Support the 'current' global object. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14647) <!-- Reviewable:end -->
This commit is contained in:
commit
885d152e92
10 changed files with 51 additions and 23 deletions
|
@ -1822,6 +1822,7 @@ impl Document {
|
|||
pub fn new_inherited(window: &Window,
|
||||
browsing_context: Option<&BrowsingContext>,
|
||||
url: Option<ServoUrl>,
|
||||
origin: Origin,
|
||||
is_html_document: IsHTMLDocument,
|
||||
content_type: Option<DOMString>,
|
||||
last_modified: Option<String>,
|
||||
|
@ -1838,15 +1839,6 @@ impl Document {
|
|||
(DocumentReadyState::Complete, true)
|
||||
};
|
||||
|
||||
// Incomplete implementation of Document origin specification at
|
||||
// https://html.spec.whatwg.org/multipage/#origin:document
|
||||
let origin = if url_has_network_scheme(&url) {
|
||||
Origin::new(&url)
|
||||
} else {
|
||||
// Default to DOM standard behaviour
|
||||
Origin::opaque_identifier()
|
||||
};
|
||||
|
||||
Document {
|
||||
node: Node::new_document_node(),
|
||||
window: JS::from_ref(window),
|
||||
|
@ -1932,6 +1924,7 @@ impl Document {
|
|||
Ok(Document::new(window,
|
||||
None,
|
||||
None,
|
||||
doc.origin().alias(),
|
||||
IsHTMLDocument::NonHTMLDocument,
|
||||
None,
|
||||
None,
|
||||
|
@ -1944,6 +1937,7 @@ impl Document {
|
|||
pub fn new(window: &Window,
|
||||
browsing_context: Option<&BrowsingContext>,
|
||||
url: Option<ServoUrl>,
|
||||
origin: Origin,
|
||||
doctype: IsHTMLDocument,
|
||||
content_type: Option<DOMString>,
|
||||
last_modified: Option<String>,
|
||||
|
@ -1955,6 +1949,7 @@ impl Document {
|
|||
let document = reflect_dom_object(box Document::new_inherited(window,
|
||||
browsing_context,
|
||||
url,
|
||||
origin,
|
||||
doctype,
|
||||
content_type,
|
||||
last_modified,
|
||||
|
@ -2026,6 +2021,8 @@ impl Document {
|
|||
let new_doc = Document::new(self.window(),
|
||||
None,
|
||||
None,
|
||||
// https://github.com/whatwg/html/issues/2109
|
||||
Origin::opaque_identifier(),
|
||||
doctype,
|
||||
None,
|
||||
None,
|
||||
|
|
|
@ -79,6 +79,7 @@ impl DOMImplementationMethods for DOMImplementation {
|
|||
let doc = XMLDocument::new(win,
|
||||
None,
|
||||
None,
|
||||
self.document.origin().alias(),
|
||||
IsHTMLDocument::NonHTMLDocument,
|
||||
Some(DOMString::from(content_type)),
|
||||
None,
|
||||
|
@ -124,6 +125,7 @@ impl DOMImplementationMethods for DOMImplementation {
|
|||
let doc = Document::new(win,
|
||||
None,
|
||||
None,
|
||||
self.document.origin().alias(),
|
||||
IsHTMLDocument::HTMLDocument,
|
||||
None,
|
||||
None,
|
||||
|
|
|
@ -61,6 +61,7 @@ impl DOMParserMethods for DOMParser {
|
|||
let document = Document::new(&self.window,
|
||||
None,
|
||||
Some(url.clone()),
|
||||
doc.origin().alias(),
|
||||
IsHTMLDocument::HTMLDocument,
|
||||
Some(content_type),
|
||||
None,
|
||||
|
@ -77,6 +78,7 @@ impl DOMParserMethods for DOMParser {
|
|||
let document = Document::new(&self.window,
|
||||
None,
|
||||
Some(url.clone()),
|
||||
doc.origin().alias(),
|
||||
IsHTMLDocument::NonHTMLDocument,
|
||||
Some(content_type),
|
||||
None,
|
||||
|
|
|
@ -27,7 +27,7 @@ use js::jsapi::{HandleValue, Evaluate2, JSAutoCompartment, JSContext};
|
|||
use js::jsapi::{JSObject, JS_GetContext};
|
||||
use js::jsapi::{JS_GetObjectRuntime, MutableHandleValue};
|
||||
use js::panic::maybe_resume_unwind;
|
||||
use js::rust::{CompileOptionsWrapper, get_object_class};
|
||||
use js::rust::{CompileOptionsWrapper, Runtime, get_object_class};
|
||||
use libc;
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use net_traits::{CoreResourceThread, ResourceThreads, IpcSend};
|
||||
|
@ -506,6 +506,19 @@ impl GlobalScope {
|
|||
}
|
||||
unreachable!();
|
||||
}
|
||||
|
||||
/// Returns the ["current"] global object.
|
||||
///
|
||||
/// ["current"]: https://html.spec.whatwg.org/multipage/#current
|
||||
#[allow(unsafe_code)]
|
||||
pub fn current() -> Root<Self> {
|
||||
unsafe {
|
||||
let cx = Runtime::get();
|
||||
assert!(!cx.is_null());
|
||||
let global = CurrentGlobalOrNull(cx);
|
||||
global_scope_from_global(global)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn timestamp_in_ms(time: Timespec) -> u64 {
|
||||
|
|
|
@ -168,7 +168,7 @@ impl HTMLIFrameElement {
|
|||
layout_threads: PREFS.get("layout.threads").as_u64().expect("count") as usize,
|
||||
};
|
||||
|
||||
ScriptThread::process_attach_layout(new_layout_info);
|
||||
ScriptThread::process_attach_layout(new_layout_info, document.origin().alias());
|
||||
} else {
|
||||
let load_info = IFrameLoadInfoWithData {
|
||||
info: load_info,
|
||||
|
@ -332,11 +332,9 @@ impl HTMLIFrameElement {
|
|||
self.pipeline_id.get()
|
||||
.and_then(|pipeline_id| ScriptThread::find_document(pipeline_id))
|
||||
.and_then(|document| {
|
||||
// FIXME(#10964): this should use the Document's origin and the
|
||||
// origin of the incumbent settings object.
|
||||
let contained_url = document.global().get_url();
|
||||
if self.global().get_url().origin() == contained_url.origin() ||
|
||||
contained_url.as_str() == "about:blank" {
|
||||
let current_global = GlobalScope::current();
|
||||
let current_document = current_global.as_window().Document();
|
||||
if document.origin().same_origin(current_document.origin()) {
|
||||
Some(Root::from_ref(document.window()))
|
||||
} else {
|
||||
None
|
||||
|
|
|
@ -1720,6 +1720,8 @@ impl Node {
|
|||
let loader = DocumentLoader::new(&*document.loader());
|
||||
let document = Document::new(window, None,
|
||||
Some(document.url()),
|
||||
// https://github.com/whatwg/dom/issues/378
|
||||
document.origin().alias(),
|
||||
is_html_doc, None,
|
||||
None, DocumentSource::NotFromParser, loader,
|
||||
None, None);
|
||||
|
|
|
@ -106,6 +106,7 @@ impl ServoParser {
|
|||
// Step 1.
|
||||
let loader = DocumentLoader::new(&*context_document.loader());
|
||||
let document = Document::new(window, None, Some(url.clone()),
|
||||
context_document.origin().alias(),
|
||||
IsHTMLDocument::HTMLDocument,
|
||||
None, None,
|
||||
DocumentSource::FromParser,
|
||||
|
|
|
@ -16,6 +16,7 @@ use dom::location::Location;
|
|||
use dom::node::Node;
|
||||
use dom::window::Window;
|
||||
use js::jsapi::{JSContext, JSObject};
|
||||
use origin::Origin;
|
||||
use servo_url::ServoUrl;
|
||||
|
||||
// https://dom.spec.whatwg.org/#xmldocument
|
||||
|
@ -28,6 +29,7 @@ impl XMLDocument {
|
|||
fn new_inherited(window: &Window,
|
||||
browsing_context: Option<&BrowsingContext>,
|
||||
url: Option<ServoUrl>,
|
||||
origin: Origin,
|
||||
is_html_document: IsHTMLDocument,
|
||||
content_type: Option<DOMString>,
|
||||
last_modified: Option<String>,
|
||||
|
@ -37,6 +39,7 @@ impl XMLDocument {
|
|||
document: Document::new_inherited(window,
|
||||
browsing_context,
|
||||
url,
|
||||
origin,
|
||||
is_html_document,
|
||||
content_type,
|
||||
last_modified,
|
||||
|
@ -50,6 +53,7 @@ impl XMLDocument {
|
|||
pub fn new(window: &Window,
|
||||
browsing_context: Option<&BrowsingContext>,
|
||||
url: Option<ServoUrl>,
|
||||
origin: Origin,
|
||||
doctype: IsHTMLDocument,
|
||||
content_type: Option<DOMString>,
|
||||
last_modified: Option<String>,
|
||||
|
@ -60,6 +64,7 @@ impl XMLDocument {
|
|||
box XMLDocument::new_inherited(window,
|
||||
browsing_context,
|
||||
url,
|
||||
origin,
|
||||
doctype,
|
||||
content_type,
|
||||
last_modified,
|
||||
|
|
|
@ -1204,6 +1204,7 @@ impl XMLHttpRequest {
|
|||
Document::new(win,
|
||||
None,
|
||||
parsed_url,
|
||||
doc.origin().alias(),
|
||||
is_html_document,
|
||||
content_type,
|
||||
None,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue