Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade rusty_v8 to 0.16.0 (alternative for #9161) #9180

Merged
merged 1 commit into from
Jan 20, 2021
Merged

upgrade rusty_v8 to 0.16.0 (alternative for #9161) #9180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ lazy_static = "1.4.0"
libc = "0.2.82"
log = "0.4.13"
pin-project = "1.0.4"
rusty_v8 = "0.15.0"
rusty_v8 = "0.16.0"
serde = { version = "1.0.116", features = ["derive"] }
serde_json = { version = "1.0.61", features = ["preserve_order"] }
smallvec = "1.6.1"
Expand Down
44 changes: 16 additions & 28 deletions core/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,49 +59,37 @@ pub fn script_origin<'a>(
s: &mut v8::HandleScope<'a>,
resource_name: v8::Local<'a, v8::String>,
) -> v8::ScriptOrigin<'a> {
let resource_line_offset = v8::Integer::new(s, 0);
let resource_column_offset = v8::Integer::new(s, 0);
let resource_is_shared_cross_origin = v8::Boolean::new(s, false);
let script_id = v8::Integer::new(s, 123);
let source_map_url = v8::String::new(s, "").unwrap();
let resource_is_opaque = v8::Boolean::new(s, true);
let is_wasm = v8::Boolean::new(s, false);
let is_module = v8::Boolean::new(s, false);
v8::ScriptOrigin::new(
s,
resource_name.into(),
resource_line_offset,
resource_column_offset,
resource_is_shared_cross_origin,
script_id,
0,
0,
false,
123,
source_map_url.into(),
resource_is_opaque,
is_wasm,
is_module,
true,
false,
false,
)
}

pub fn module_origin<'a>(
s: &mut v8::HandleScope<'a>,
resource_name: v8::Local<'a, v8::String>,
) -> v8::ScriptOrigin<'a> {
let resource_line_offset = v8::Integer::new(s, 0);
let resource_column_offset = v8::Integer::new(s, 0);
let resource_is_shared_cross_origin = v8::Boolean::new(s, false);
let script_id = v8::Integer::new(s, 123);
let source_map_url = v8::String::new(s, "").unwrap();
let resource_is_opaque = v8::Boolean::new(s, true);
let is_wasm = v8::Boolean::new(s, false);
let is_module = v8::Boolean::new(s, true);
v8::ScriptOrigin::new(
s,
resource_name.into(),
resource_line_offset,
resource_column_offset,
resource_is_shared_cross_origin,
script_id,
0,
0,
false,
123,
source_map_url.into(),
resource_is_opaque,
is_wasm,
is_module,
true,
false,
true,
)
}

Expand Down
12 changes: 6 additions & 6 deletions runtime/inspector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ enum PollState {

pub struct DenoInspector {
v8_inspector_client: v8::inspector::V8InspectorClientBase,
v8_inspector: v8::UniqueRef<v8::inspector::V8Inspector>,
v8_inspector: v8::UniquePtr<v8::inspector::V8Inspector>,
sessions: RefCell<InspectorSessions>,
flags: RefCell<InspectorFlags>,
waker: Arc<InspectorWaker>,
Expand All @@ -417,13 +417,13 @@ pub struct DenoInspector {
impl Deref for DenoInspector {
type Target = v8::inspector::V8Inspector;
fn deref(&self) -> &Self::Target {
&self.v8_inspector
self.v8_inspector.as_ref().unwrap()
}
}

impl DerefMut for DenoInspector {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.v8_inspector
self.v8_inspector.as_mut().unwrap()
}
}

Expand Down Expand Up @@ -494,8 +494,6 @@ impl DenoInspector {
let mut self_ = new_box_with(|self_ptr| {
let v8_inspector_client =
v8::inspector::V8InspectorClientBase::new::<Self>();
let v8_inspector =
v8::inspector::V8Inspector::create(scope, unsafe { &mut *self_ptr });

let sessions = InspectorSessions::new(self_ptr, new_websocket_rx);
let flags = InspectorFlags::new();
Expand All @@ -519,7 +517,7 @@ impl DenoInspector {

Self {
v8_inspector_client,
v8_inspector,
v8_inspector: Default::default(),
sessions,
flags,
waker,
Expand All @@ -528,6 +526,8 @@ impl DenoInspector {
debugger_url,
}
});
self_.v8_inspector =
v8::inspector::V8Inspector::create(scope, &mut *self_).into();

// Tell the inspector about the global context.
let context = v8::Local::new(scope, context);
Expand Down