mirror of
https://github.com/servo/servo.git
synced 2025-08-02 20:20:14 +01:00
Make script origins sendable and immutable.
This commit is contained in:
parent
922aef9dd6
commit
555661ef1c
2 changed files with 12 additions and 64 deletions
|
@ -2,63 +2,53 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use ref_filter_map::ref_filter_map;
|
||||
use std::cell::{RefCell, Ref};
|
||||
use std::rc::Rc;
|
||||
use std::sync::Arc;
|
||||
use url::Origin as UrlOrigin;
|
||||
use url::{Url, Host};
|
||||
|
||||
/// A representation of an [origin](https://html.spec.whatwg.org/multipage/#origin-2).
|
||||
#[derive(HeapSizeOf)]
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
pub struct Origin {
|
||||
#[ignore_heap_size_of = "Rc<T> has unclear ownership semantics"]
|
||||
inner: Rc<RefCell<UrlOrigin>>,
|
||||
#[ignore_heap_size_of = "Arc<T> has unclear ownership semantics"]
|
||||
inner: Arc<UrlOrigin>,
|
||||
}
|
||||
|
||||
// We can't use RefCell inside JSTraceable, but Origin doesn't contain JS values and
|
||||
// DOMRefCell makes it much harder to write unit tests (due to setting up required TLS).
|
||||
no_jsmanaged_fields!(Origin);
|
||||
|
||||
impl Origin {
|
||||
/// Create a new origin comprising a unique, opaque identifier.
|
||||
pub fn opaque_identifier() -> Origin {
|
||||
Origin {
|
||||
inner: Rc::new(RefCell::new(UrlOrigin::new_opaque())),
|
||||
inner: Arc::new(UrlOrigin::new_opaque()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a new origin for the given URL.
|
||||
pub fn new(url: &Url) -> Origin {
|
||||
Origin {
|
||||
inner: Rc::new(RefCell::new(url.origin())),
|
||||
inner: Arc::new(url.origin()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set(&self, origin: UrlOrigin) {
|
||||
*self.inner.borrow_mut() = origin;
|
||||
}
|
||||
|
||||
/// Does this origin represent a host/scheme/port tuple?
|
||||
pub fn is_scheme_host_port_tuple(&self) -> bool {
|
||||
self.inner.borrow().is_tuple()
|
||||
self.inner.is_tuple()
|
||||
}
|
||||
|
||||
/// Return the host associated with this origin.
|
||||
pub fn host(&self) -> Option<Ref<Host<String>>> {
|
||||
ref_filter_map(self.inner.borrow(), |origin| match *origin {
|
||||
pub fn host(&self) -> Option<&Host<String>> {
|
||||
match *self.inner {
|
||||
UrlOrigin::Tuple(_, ref host, _) => Some(host),
|
||||
UrlOrigin::Opaque(..) => None,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// https://html.spec.whatwg.org/multipage/#same-origin
|
||||
pub fn same_origin(&self, other: &Origin) -> bool {
|
||||
*self.inner.borrow() == *other.inner.borrow()
|
||||
self.inner == other.inner
|
||||
}
|
||||
|
||||
pub fn copy(&self) -> Origin {
|
||||
Origin {
|
||||
inner: Rc::new(RefCell::new(self.inner.borrow().clone())),
|
||||
inner: Arc::new((*self.inner).clone()),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue