mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Format.
This commit is contained in:
parent
76edfce6a7
commit
f76bb20c2e
9 changed files with 60 additions and 43 deletions
|
@ -44,8 +44,12 @@ use js::jsval::ObjectValue;
|
|||
use js::jsval::UndefinedValue;
|
||||
use js::rust::wrappers::JS_AlreadyHasOwnPropertyById;
|
||||
use js::rust::wrappers::JS_NewObjectWithGivenProto;
|
||||
use js::rust::wrappers::{AppendToIdVector, RUST_INTERNED_STRING_TO_JSID, SetDataPropertyDescriptor};
|
||||
use js::rust::{get_context_realm, Handle, HandleObject, HandleValue, MutableHandle, MutableHandleObject};
|
||||
use js::rust::wrappers::{
|
||||
AppendToIdVector, SetDataPropertyDescriptor, RUST_INTERNED_STRING_TO_JSID,
|
||||
};
|
||||
use js::rust::{
|
||||
get_context_realm, Handle, HandleObject, HandleValue, MutableHandle, MutableHandleObject,
|
||||
};
|
||||
use std::{ffi::CStr, os::raw::c_char, ptr};
|
||||
|
||||
/// Determine if this id shadows any existing properties for this proxy.
|
||||
|
|
|
@ -8,6 +8,7 @@ use crate::dom::bindings::conversions::jsid_to_string;
|
|||
use crate::dom::bindings::str::{ByteString, DOMString, USVString};
|
||||
use indexmap::IndexMap;
|
||||
use js::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible};
|
||||
use js::jsapi::glue::JS_GetOwnPropertyDescriptorById;
|
||||
use js::jsapi::HandleId as RawHandleId;
|
||||
use js::jsapi::JSContext;
|
||||
use js::jsapi::JS_NewPlainObject;
|
||||
|
@ -20,7 +21,6 @@ use js::jsval::ObjectValue;
|
|||
use js::jsval::UndefinedValue;
|
||||
use js::rust::wrappers::GetPropertyKeys;
|
||||
use js::rust::wrappers::JS_DefineUCProperty2;
|
||||
use js::jsapi::glue::JS_GetOwnPropertyDescriptorById;
|
||||
use js::rust::wrappers::JS_GetPropertyById;
|
||||
use js::rust::wrappers::JS_IdToValue;
|
||||
use js::rust::HandleId;
|
||||
|
@ -136,8 +136,13 @@ where
|
|||
rooted!(in(cx) let mut desc = PropertyDescriptor::default());
|
||||
|
||||
let mut is_none = false;
|
||||
if !JS_GetOwnPropertyDescriptorById(cx, object.handle().into(), id.handle().into(), desc.handle_mut().into(), &mut is_none)
|
||||
{
|
||||
if !JS_GetOwnPropertyDescriptorById(
|
||||
cx,
|
||||
object.handle().into(),
|
||||
id.handle().into(),
|
||||
desc.handle_mut().into(),
|
||||
&mut is_none,
|
||||
) {
|
||||
return Err(());
|
||||
}
|
||||
|
||||
|
|
|
@ -18,9 +18,9 @@ use crate::dom::windowproxy;
|
|||
use crate::script_runtime::JSContext as SafeJSContext;
|
||||
use js::conversions::ToJSValConvertible;
|
||||
use js::glue::JS_GetReservedSlot;
|
||||
use js::glue::RUST_FUNCTION_VALUE_TO_JITINFO;
|
||||
use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper};
|
||||
use js::glue::{UnwrapObjectDynamic, UnwrapObjectStatic};
|
||||
use js::glue::RUST_FUNCTION_VALUE_TO_JITINFO;
|
||||
use js::jsapi::HandleId as RawHandleId;
|
||||
use js::jsapi::HandleObject as RawHandleObject;
|
||||
use js::jsapi::MutableHandleIdVector as RawMutableHandleIdVector;
|
||||
|
|
|
@ -82,7 +82,7 @@ use js::glue::{IsWrapper, UnwrapObjectDynamic};
|
|||
use js::jsapi::Compile1;
|
||||
use js::jsapi::SetScriptPrivate;
|
||||
use js::jsapi::{CurrentGlobalOrNull, GetNonCCWObjectGlobal};
|
||||
use js::jsapi::{HandleObject, Heap, InstantiateOptions, InstantiateGlobalStencil};
|
||||
use js::jsapi::{HandleObject, Heap, InstantiateGlobalStencil, InstantiateOptions};
|
||||
use js::jsapi::{JSContext, JSObject, JSScript};
|
||||
use js::jsval::PrivateValue;
|
||||
use js::jsval::{JSVal, UndefinedValue};
|
||||
|
@ -2631,7 +2631,12 @@ impl GlobalScope {
|
|||
hideScriptFromDebugger: false,
|
||||
deferDebugMetadata: false,
|
||||
};
|
||||
let script = InstantiateGlobalStencil(*cx, &options, *pre_compiled_script.source_code, ptr::null_mut());
|
||||
let script = InstantiateGlobalStencil(
|
||||
*cx,
|
||||
&options,
|
||||
*pre_compiled_script.source_code,
|
||||
ptr::null_mut(),
|
||||
);
|
||||
compiled_script.set(script);
|
||||
},
|
||||
};
|
||||
|
|
|
@ -42,11 +42,11 @@ use encoding_rs::Encoding;
|
|||
use html5ever::{LocalName, Prefix};
|
||||
use ipc_channel::ipc;
|
||||
use ipc_channel::router::ROUTER;
|
||||
use js::jsapi::{
|
||||
CanCompileOffThread, CompileToStencilOffThread1, OffThreadToken,
|
||||
};
|
||||
use js::jsapi::{CanCompileOffThread, CompileToStencilOffThread1, OffThreadToken};
|
||||
use js::jsval::UndefinedValue;
|
||||
use js::rust::{transform_str_to_source_text, CompileOptionsWrapper, FinishOffThreadStencil, Stencil};
|
||||
use js::rust::{
|
||||
transform_str_to_source_text, CompileOptionsWrapper, FinishOffThreadStencil, Stencil,
|
||||
};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use net_traits::request::{
|
||||
CorsSettings, CredentialsMode, Destination, ParserMetadata, RequestBuilder,
|
||||
|
@ -1109,7 +1109,8 @@ impl HTMLScriptElement {
|
|||
|
||||
if let Some(record) = record {
|
||||
rooted!(in(*global.get_cx()) let mut rval = UndefinedValue());
|
||||
let evaluated = module_tree.execute_module(global, record, rval.handle_mut().into());
|
||||
let evaluated =
|
||||
module_tree.execute_module(global, record, rval.handle_mut().into());
|
||||
|
||||
if let Err(exception) = evaluated {
|
||||
module_tree.set_rethrow_error(exception);
|
||||
|
|
|
@ -18,15 +18,15 @@ use js::glue::{
|
|||
CreateReadableStreamUnderlyingSource, DeleteReadableStreamUnderlyingSource,
|
||||
ReadableStreamUnderlyingSourceTraps,
|
||||
};
|
||||
use js::jsapi::{HandleObject, HandleValue, Heap, JSContext, JSObject};
|
||||
use js::jsapi::{
|
||||
IsReadableStream, NewReadableExternalSourceStreamObject, ReadableStreamClose,
|
||||
ReadableStreamDefaultReaderRead, ReadableStreamError, ReadableStreamGetReader,
|
||||
ReadableStreamIsDisturbed, ReadableStreamIsLocked, ReadableStreamIsReadable,
|
||||
ReadableStreamReaderMode, ReadableStreamReaderReleaseLock, ReadableStreamUnderlyingSource,
|
||||
ReadableStreamUpdateDataAvailableFromSource, UnwrapReadableStream, JS_GetArrayBufferViewData,
|
||||
AutoRequireNoGC,
|
||||
AutoRequireNoGC, IsReadableStream, JS_GetArrayBufferViewData,
|
||||
NewReadableExternalSourceStreamObject, ReadableStreamClose, ReadableStreamDefaultReaderRead,
|
||||
ReadableStreamError, ReadableStreamGetReader, ReadableStreamIsDisturbed,
|
||||
ReadableStreamIsLocked, ReadableStreamIsReadable, ReadableStreamReaderMode,
|
||||
ReadableStreamReaderReleaseLock, ReadableStreamUnderlyingSource,
|
||||
ReadableStreamUpdateDataAvailableFromSource, UnwrapReadableStream,
|
||||
};
|
||||
use js::jsapi::{HandleObject, HandleValue, Heap, JSContext, JSObject};
|
||||
use js::jsval::JSVal;
|
||||
use js::jsval::UndefinedValue;
|
||||
use js::rust::HandleValue as SafeHandleValue;
|
||||
|
@ -339,7 +339,11 @@ unsafe extern "C" fn write_into_read_request_buffer(
|
|||
) {
|
||||
let source = &*(source as *const ExternalUnderlyingSourceController);
|
||||
let mut is_shared_memory = false;
|
||||
let buffer = JS_GetArrayBufferViewData(*chunk, &mut is_shared_memory, &AutoRequireNoGC { _address: 0 });
|
||||
let buffer = JS_GetArrayBufferViewData(
|
||||
*chunk,
|
||||
&mut is_shared_memory,
|
||||
&AutoRequireNoGC { _address: 0 },
|
||||
);
|
||||
assert!(!is_shared_memory);
|
||||
let slice = slice::from_raw_parts_mut(buffer as *mut u8, length);
|
||||
source.write_into_buffer(slice);
|
||||
|
|
|
@ -25,9 +25,7 @@ use embedder_traits::EmbedderMsg;
|
|||
use indexmap::map::IndexMap;
|
||||
use ipc_channel::ipc;
|
||||
use js::glue::{CreateWrapperProxyHandler, ProxyTraps};
|
||||
use js::glue::{
|
||||
GetProxyPrivate, GetProxyReservedSlot, SetProxyReservedSlot,
|
||||
};
|
||||
use js::glue::{GetProxyPrivate, GetProxyReservedSlot, SetProxyReservedSlot};
|
||||
use js::jsapi::Handle as RawHandle;
|
||||
use js::jsapi::HandleId as RawHandleId;
|
||||
use js::jsapi::HandleObject as RawHandleObject;
|
||||
|
@ -35,7 +33,7 @@ use js::jsapi::HandleValue as RawHandleValue;
|
|||
use js::jsapi::MutableHandle as RawMutableHandle;
|
||||
use js::jsapi::MutableHandleObject as RawMutableHandleObject;
|
||||
use js::jsapi::MutableHandleValue as RawMutableHandleValue;
|
||||
use js::jsapi::{JSAutoRealm, JSContext, JSErrNum, JSObject, GCContext};
|
||||
use js::jsapi::{GCContext, JSAutoRealm, JSContext, JSErrNum, JSObject};
|
||||
use js::jsapi::{JSTracer, JS_DefinePropertyById, JSPROP_ENUMERATE, JSPROP_READONLY};
|
||||
use js::jsapi::{JS_ForwardGetPropertyTo, JS_ForwardSetPropertyTo};
|
||||
use js::jsapi::{JS_GetOwnPropertyDescriptorById, JS_IsExceptionPending};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue