Skip to content

Commit bbfeb2a

Browse files
TruongQuangSBTruongQuangSB
authored
Revert "Bump jni from 0.19.0 to 0.21.1 in /native (#131)" (#151)
This reverts commit f58c66e.
1 parent a97de7c commit bbfeb2a

File tree

18 files changed

+123
-193
lines changed

18 files changed

+123
-193
lines changed

‎native/Cargo.lock‎

Lines changed: 2 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎native/chromium/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ crate-type = ["rlib"]
99
[dependencies]
1010
chromium_jni_utils = { path = "../chromium_jni_utils/" }
1111
chromium_jni_macro = { path = "../chromium_jni_macro/" }
12-
jni = "0.21.1"
12+
jni = "0.19.0"
1313
winapi = { version = "0.3.9", features = ["winuser", "libloaderapi"] }
1414

1515
[features]

‎native/chromium/build.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,4 @@ fn generator(cef_path: std::path::Display) -> bindgen::Builder {
193193
.raw_line("use jni::objects::GlobalRef;")
194194
.raw_line("use jni::objects::JObject;")
195195
.raw_line("use chromium_jni_utils::jni_unwrap;")
196-
.raw_line("use std::ops::DerefMut;")
197196
}

‎native/chromium/src/cef/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use crate::ToJava;
1616
use jni::objects::GlobalRef;
1717
use jni::objects::JObject;
1818
use chromium_jni_utils::jni_unwrap;
19-
use std::ops::DerefMut;
2019
pub mod win;
2120
pub use self::win::_cef_window_info_t;
2221
pub use self::win::_cef_main_args_t;

‎native/chromium/src/cef/win.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use crate::ToJava;
1616
use jni::objects::GlobalRef;
1717
use jni::objects::JObject;
1818
use chromium_jni_utils::jni_unwrap;
19-
use std::ops::DerefMut;
2019
use crate::cef::cef_string_t;
2120

2221
pub type DWORD = ::std::os::raw::c_ulong;

‎native/chromium/src/lib.rs‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ use jni::objects::JValue;
1616
use jni::JNIEnv;
1717

1818
impl FromJavaMember for cef::cef_base_ref_counted_t {
19-
fn from_java_member(
20-
env: &mut JNIEnv,
21-
object: &JObject,
22-
name: &str,
23-
) -> cef::cef_base_ref_counted_t {
19+
fn from_java_member(env: JNIEnv, object: JObject, name: &str) -> cef::cef_base_ref_counted_t {
2420
let obj = env
2521
.get_field(
2622
object,
@@ -30,114 +26,114 @@ impl FromJavaMember for cef::cef_base_ref_counted_t {
3026
.unwrap()
3127
.l()
3228
.unwrap();
33-
FromJava::from_java(env, &obj)
29+
FromJava::from_java(env, obj)
3430
}
3531
}
3632

3733
/// Allows constructing an object from a Java object
3834
pub trait ToJava<'a> {
3935
/// Constructs `Self` from the JNI object `object`
40-
fn to_java(_env: &JNIEnv<'a>, value: Self) -> JValue<'a, 'a>;
36+
fn to_java(_env: JNIEnv<'a>, value: Self) -> JValue<'a>;
4137
}
4238

4339
impl<'a, T> ToJava<'a> for *mut T {
44-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
40+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
4541
JValue::Long(value as i64)
4642
}
4743
}
4844
impl<'a, T> ToJava<'a> for *const T {
49-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
45+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
5046
JValue::Long(value as i64)
5147
}
5248
}
5349

5450
impl<'a> ToJava<'a> for i32 {
55-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
51+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
5652
JValue::Int(value)
5753
}
5854
}
5955

6056
impl<'a> ToJava<'a> for usize {
61-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
57+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
6258
JValue::Long(value.try_into().unwrap())
6359
}
6460
}
6561
impl<'a> ToJava<'a> for i64 {
66-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
62+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
6763
JValue::Long(value)
6864
}
6965
}
7066
impl<'a> ToJava<'a> for f64 {
71-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
67+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
7268
JValue::Double(value)
7369
}
7470
}
7571

7672
impl<'a> ToJava<'a> for cef::cef_process_id_t {
77-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
73+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
7874
JValue::Int(unsafe { std::mem::transmute(value) })
7975
}
8076
}
8177
impl<'a> ToJava<'a> for cef::cef_cursor_type_t {
82-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
78+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
8379
JValue::Int(unsafe { std::mem::transmute(value) })
8480
}
8581
}
8682
impl<'a> ToJava<'a> for cef::cef_errorcode_t {
87-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
83+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
8884
JValue::Int(unsafe { std::mem::transmute(value) })
8985
}
9086
}
9187
impl<'a> ToJava<'a> for cef::cef_transition_type_t {
92-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
88+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
9389
JValue::Int(unsafe { std::mem::transmute(value) })
9490
}
9591
}
9692

9793
impl<'a> ToJava<'a> for cef::cef_window_open_disposition_t {
98-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
94+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
9995
JValue::Int(unsafe { std::mem::transmute(value) })
10096
}
10197
}
10298

10399
impl<'a> ToJava<'a> for cef::cef_log_severity_t {
104-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
100+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
105101
JValue::Int(unsafe { std::mem::transmute(value) })
106102
}
107103
}
108104

109105
impl<'a> ToJava<'a> for cef::cef_event_flags_t {
110-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
106+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
111107
JValue::Int(unsafe { std::mem::transmute(value) })
112108
}
113109
}
114110

115111
impl<'a> ToJava<'a> for cef::cef_termination_status_t {
116-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
112+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
117113
JValue::Int(unsafe { std::mem::transmute(value) })
118114
}
119115
}
120116

121117
impl<'a> ToJava<'a> for cef::cef_focus_source_t {
122-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
118+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
123119
JValue::Int(unsafe { std::mem::transmute(value) })
124120
}
125121
}
126122

127123
impl<'a> ToJava<'a> for cef::cef_jsdialog_type_t {
128-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
124+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
129125
JValue::Int(unsafe { std::mem::transmute(value) })
130126
}
131127
}
132128

133129
impl<'a> ToJava<'a> for cef::cef_quick_menu_edit_state_flags_t {
134-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
130+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
135131
JValue::Int(unsafe { std::mem::transmute(value) })
136132
}
137133
}
138134

139135
impl<'a> ToJava<'a> for cef::cef_preferences_type_t {
140-
fn to_java(mut _env: &JNIEnv, value: Self) -> JValue<'a, 'a> {
136+
fn to_java(_env: JNIEnv, value: Self) -> JValue<'a> {
141137
JValue::Int(unsafe { std::mem::transmute(value) })
142138
}
143139
}

‎native/chromium_jni/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "1.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
jni = "0.21.1"
7+
jni = "0.19.0"
88
chromium = { path = "../chromium/" }
99
chromium_swt = { path = "../chromium_swt/" }
1010
chromium_jni_macro = { path = "../chromium_jni_macro/" }

‎native/chromium_jni/src/allocate.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ use jni::JNIEnv;
1919
macro_rules! jni_allocate {
2020
($name:tt, $type:ty) => {
2121
#[jni_name($name, $type)]
22-
pub extern "C" fn allocate(env: JNIEnv, _class: JClass, object: &JObject) -> jlong {
23-
let global_ref = env.new_global_ref(object).unwrap();
24-
let object: JNIWrapperType<$type> = JNICEFCallback::jni_allocate(env, global_ref);
22+
pub extern "C" fn allocate(env: JNIEnv, _class: JClass, object: JObject) -> jlong {
23+
let object: JNIWrapperType<$type> =
24+
JNICEFCallback::jni_allocate(env, env.new_global_ref(object).unwrap());
2525
return Box::into_raw(Box::new(object)) as jlong;
2626
}
2727
};
@@ -32,7 +32,7 @@ macro_rules! jni_deallocate {
3232
($name:tt, $type:ty) => {
3333
#[jni_name($name, $type)]
3434
pub extern "C" fn deallocate(
35-
mut _env: JNIEnv,
35+
_env: JNIEnv,
3636
_class: JClass,
3737
object: *mut chromium::cef::_cef_display_handler_t,
3838
) {

‎native/chromium_jni/src/swt_wrapper.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ use jni::JNIEnv;
1212

1313
#[no_mangle]
1414
pub extern "C" fn Java_org_eclipse_set_browser_lib_ChromiumLib_memmove__Lorg_eclipse_set_browser_lib_cef_1popup_1features_1t_2J(
15-
mut env: JNIEnv,
15+
env: JNIEnv,
1616
_class: JClass,
17-
destination: &JObject,
17+
destination: JObject,
1818
source: *mut chromium::cef::_cef_popup_features_t,
1919
) {
2020
let source_object = unsafe { *source };
@@ -53,10 +53,10 @@ pub extern "C" fn Java_org_eclipse_set_browser_lib_ChromiumLib_memmove__Lorg_ecl
5353

5454
#[no_mangle]
5555
pub extern "C" fn Java_org_eclipse_set_browser_lib_ChromiumLib_cefswt_1function_1id(
56-
mut _env: JNIEnv,
56+
_env: JNIEnv,
5757
_class: JClass,
5858
arg0: jlong,
59-
arg1: &JObject,
59+
arg1: JObject,
6060
) {
6161
// IMPROVE: Avoid creating this object here
6262
let mut func_st = chromium_swt::FunctionSt {

‎native/chromium_jni_macro/src/derive_from_java_impl.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn derive_from_java_impl(tokens: TokenStream) -> TokenStream {
3838

3939
let modified = quote! {
4040
impl FromJava for #name {
41-
fn from_java(env: &mut JNIEnv, object: &JObject) -> #name {
41+
fn from_java(env: JNIEnv, object: JObject) -> #name {
4242
return #name {
4343
#(#query_parts, )*
4444
};

0 commit comments

Comments
 (0)