mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Remove unused argument from AlreadyInRealm::assert.
This commit is contained in:
parent
fca5833e21
commit
5e5669b945
8 changed files with 10 additions and 12 deletions
|
@ -718,8 +718,7 @@ impl Callback for ConsumeBodyPromiseHandler {
|
||||||
// https://fetch.spec.whatwg.org/#concept-body-consume-body
|
// https://fetch.spec.whatwg.org/#concept-body-consume-body
|
||||||
#[allow(unrooted_must_root)]
|
#[allow(unrooted_must_root)]
|
||||||
pub fn consume_body<T: BodyMixin + DomObject>(object: &T, body_type: BodyType) -> Rc<Promise> {
|
pub fn consume_body<T: BodyMixin + DomObject>(object: &T, body_type: BodyType) -> Rc<Promise> {
|
||||||
let global = object.global();
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&global);
|
|
||||||
let promise =
|
let promise =
|
||||||
Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
|
|
||||||
|
|
|
@ -238,7 +238,7 @@ impl BlobMethods for Blob {
|
||||||
// https://w3c.github.io/FileAPI/#text-method-algo
|
// https://w3c.github.io/FileAPI/#text-method-algo
|
||||||
fn Text(&self) -> Rc<Promise> {
|
fn Text(&self) -> Rc<Promise> {
|
||||||
let global = self.global();
|
let global = self.global();
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&global);
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
let id = self.get_blob_url_id();
|
let id = self.get_blob_url_id();
|
||||||
global.read_file_async(
|
global.read_file_async(
|
||||||
|
@ -261,7 +261,7 @@ impl BlobMethods for Blob {
|
||||||
// https://w3c.github.io/FileAPI/#arraybuffer-method-algo
|
// https://w3c.github.io/FileAPI/#arraybuffer-method-algo
|
||||||
fn ArrayBuffer(&self) -> Rc<Promise> {
|
fn ArrayBuffer(&self) -> Rc<Promise> {
|
||||||
let global = self.global();
|
let global = self.global();
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&global);
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
|
|
||||||
let id = self.get_blob_url_id();
|
let id = self.get_blob_url_id();
|
||||||
|
|
|
@ -287,7 +287,7 @@ where
|
||||||
T: AsyncBluetoothListener + DomObject + 'static,
|
T: AsyncBluetoothListener + DomObject + 'static,
|
||||||
F: FnOnce(StringOrUnsignedLong) -> Fallible<UUID>,
|
F: FnOnce(StringOrUnsignedLong) -> Fallible<UUID>,
|
||||||
{
|
{
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&attribute.global());
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
|
|
||||||
let result_uuid = if let Some(u) = uuid {
|
let result_uuid = if let Some(u) = uuid {
|
||||||
|
|
|
@ -3573,7 +3573,7 @@ impl Document {
|
||||||
// https://fullscreen.spec.whatwg.org/#dom-element-requestfullscreen
|
// https://fullscreen.spec.whatwg.org/#dom-element-requestfullscreen
|
||||||
pub fn enter_fullscreen(&self, pending: &Element) -> Rc<Promise> {
|
pub fn enter_fullscreen(&self, pending: &Element) -> Rc<Promise> {
|
||||||
// Step 1
|
// Step 1
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&self.global());
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let promise =
|
let promise =
|
||||||
Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
let mut error = false;
|
let mut error = false;
|
||||||
|
@ -3642,7 +3642,7 @@ impl Document {
|
||||||
pub fn exit_fullscreen(&self) -> Rc<Promise> {
|
pub fn exit_fullscreen(&self) -> Rc<Promise> {
|
||||||
let global = self.global();
|
let global = self.global();
|
||||||
// Step 1
|
// Step 1
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&global);
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let promise = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
let promise = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
// Step 2
|
// Step 2
|
||||||
if self.fullscreen_element.get().is_none() {
|
if self.fullscreen_element.get().is_none() {
|
||||||
|
|
|
@ -2733,7 +2733,7 @@ impl GlobalScope {
|
||||||
image: ImageBitmapSource,
|
image: ImageBitmapSource,
|
||||||
options: &ImageBitmapOptions,
|
options: &ImageBitmapOptions,
|
||||||
) -> Rc<Promise> {
|
) -> Rc<Promise> {
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&self);
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
if options.resizeWidth.map_or(false, |w| w == 0) {
|
if options.resizeWidth.map_or(false, |w| w == 0) {
|
||||||
p.reject_error(Error::InvalidState);
|
p.reject_error(Error::InvalidState);
|
||||||
|
|
|
@ -67,8 +67,7 @@ impl MediaDevicesMethods for MediaDevices {
|
||||||
/// https://w3c.github.io/mediacapture-main/#dom-mediadevices-enumeratedevices
|
/// https://w3c.github.io/mediacapture-main/#dom-mediadevices-enumeratedevices
|
||||||
fn EnumerateDevices(&self) -> Rc<Promise> {
|
fn EnumerateDevices(&self) -> Rc<Promise> {
|
||||||
// Step 1.
|
// Step 1.
|
||||||
let global = self.global();
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&global);
|
|
||||||
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
let p = Promise::new_in_current_realm(InRealm::Already(&in_realm_proof));
|
||||||
|
|
||||||
// Step 2.
|
// Step 2.
|
||||||
|
|
|
@ -87,7 +87,7 @@ impl Permissions {
|
||||||
let p = match promise {
|
let p = match promise {
|
||||||
Some(promise) => promise,
|
Some(promise) => promise,
|
||||||
None => {
|
None => {
|
||||||
let in_realm_proof = AlreadyInRealm::assert(&self.global());
|
let in_realm_proof = AlreadyInRealm::assert();
|
||||||
Promise::new_in_current_realm(InRealm::Already(&in_realm_proof))
|
Promise::new_in_current_realm(InRealm::Already(&in_realm_proof))
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,7 +11,7 @@ pub struct AlreadyInRealm(());
|
||||||
|
|
||||||
impl AlreadyInRealm {
|
impl AlreadyInRealm {
|
||||||
#![allow(unsafe_code)]
|
#![allow(unsafe_code)]
|
||||||
pub fn assert(_global: &GlobalScope) -> AlreadyInRealm {
|
pub fn assert() -> AlreadyInRealm {
|
||||||
unsafe {
|
unsafe {
|
||||||
assert!(!GetCurrentRealmOrNull(*GlobalScope::get_cx()).is_null());
|
assert!(!GetCurrentRealmOrNull(*GlobalScope::get_cx()).is_null());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue