Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass a JSContext to JSValConvertible::from_jsval.

Browse source
This commit is contained in:
Ms2ger 2014-03-02 22:30:54 +01:00
parent 478c9bfc57
commit 6bc2c79f92
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1246,7 +1246,7 @@ for (uint32_t i = 0; i < length; ++i) {
"if (%s) {\n" "if (%s) {\n"
" ${declName} = None;\n" " ${declName} = None;\n"
"} else {\n" "} else {\n"
" match JSValConvertible::from_jsval(${val}) {\n" " match JSValConvertible::from_jsval(cx, ${val}) {\n"
" Some(val_) => ${declName} = Some(%s),\n" " Some(val_) => ${declName} = Some(%s),\n"
" None => %s\n" " None => %s\n"
" }\n" " }\n"
@ -1261,7 +1261,7 @@ for (uint32_t i = 0; i < length; ++i) {
if preSuccess or postSuccess: if preSuccess or postSuccess:
successVal = preSuccess + successVal + postSuccess successVal = preSuccess + successVal + postSuccess
template = ( template = (
"match JSValConvertible::from_jsval(${val}) {\n" "match JSValConvertible::from_jsval(cx, ${val}) {\n"
" None => %s,\n" " None => %s,\n"
" Some(v) => %s = %s\n" " Some(v) => %s = %s\n"
"}" % (failureCode, dataLoc, successVal)) "}" % (failureCode, dataLoc, successVal))

18
src/components/script/dom/bindings/conversions.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use js::jsapi::JSVal; use js::jsapi::{JSVal, JSContext};
use js::{JSVAL_FALSE, JSVAL_TRUE}; use js::{JSVAL_FALSE, JSVAL_TRUE};
use js::glue::{RUST_UINT_TO_JSVAL, RUST_JSVAL_TO_INT, RUST_DOUBLE_TO_JSVAL}; use js::glue::{RUST_UINT_TO_JSVAL, RUST_JSVAL_TO_INT, RUST_DOUBLE_TO_JSVAL};
use js::glue::{RUST_JSVAL_TO_DOUBLE, RUST_JSVAL_IS_INT, RUST_JSVAL_IS_DOUBLE}; use js::glue::{RUST_JSVAL_TO_DOUBLE, RUST_JSVAL_IS_INT, RUST_JSVAL_IS_DOUBLE};
@ -10,7 +10,7 @@ use js::glue::{RUST_JSVAL_IS_BOOLEAN, RUST_JSVAL_TO_BOOLEAN};
pub trait JSValConvertible { pub trait JSValConvertible {
fn to_jsval(&self) -> JSVal; fn to_jsval(&self) -> JSVal;
fn from_jsval(val: JSVal) -> Option<Self>; fn from_jsval(cx: *JSContext, val: JSVal) -> Option<Self>;
} }
@ -21,7 +21,7 @@ impl JSValConvertible for i64 {
} }
} }
fn from_jsval(val: JSVal) -> Option<i64> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<i64> {
unsafe { unsafe {
if RUST_JSVAL_IS_INT(val) != 0 { if RUST_JSVAL_IS_INT(val) != 0 {
Some(RUST_JSVAL_TO_DOUBLE(val) as i64) Some(RUST_JSVAL_TO_DOUBLE(val) as i64)
@ -39,7 +39,7 @@ impl JSValConvertible for u32 {
} }
} }
fn from_jsval(val: JSVal) -> Option<u32> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<u32> {
unsafe { unsafe {
if RUST_JSVAL_IS_INT(val) != 0 { if RUST_JSVAL_IS_INT(val) != 0 {
Some(RUST_JSVAL_TO_INT(val) as u32) Some(RUST_JSVAL_TO_INT(val) as u32)
@ -57,7 +57,7 @@ impl JSValConvertible for i32 {
} }
} }
fn from_jsval(val: JSVal) -> Option<i32> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<i32> {
unsafe { unsafe {
if RUST_JSVAL_IS_INT(val) != 0 { if RUST_JSVAL_IS_INT(val) != 0 {
Some(RUST_JSVAL_TO_INT(val) as i32) Some(RUST_JSVAL_TO_INT(val) as i32)
@ -75,7 +75,7 @@ impl JSValConvertible for u16 {
} }
} }
fn from_jsval(val: JSVal) -> Option<u16> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<u16> {
unsafe { unsafe {
if RUST_JSVAL_IS_INT(val) != 0 { if RUST_JSVAL_IS_INT(val) != 0 {
Some(RUST_JSVAL_TO_INT(val) as u16) Some(RUST_JSVAL_TO_INT(val) as u16)
@ -95,7 +95,7 @@ impl JSValConvertible for bool {
} }
} }
fn from_jsval(val: JSVal) -> Option<bool> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<bool> {
unsafe { unsafe {
if RUST_JSVAL_IS_BOOLEAN(val) != 0 { if RUST_JSVAL_IS_BOOLEAN(val) != 0 {
Some(RUST_JSVAL_TO_BOOLEAN(val) != 0) Some(RUST_JSVAL_TO_BOOLEAN(val) != 0)
@ -113,7 +113,7 @@ impl JSValConvertible for f32 {
} }
} }
fn from_jsval(val: JSVal) -> Option<f32> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<f32> {
unsafe { unsafe {
if RUST_JSVAL_IS_DOUBLE(val) != 0 { if RUST_JSVAL_IS_DOUBLE(val) != 0 {
Some(RUST_JSVAL_TO_DOUBLE(val) as f32) Some(RUST_JSVAL_TO_DOUBLE(val) as f32)
@ -131,7 +131,7 @@ impl JSValConvertible for f64 {
} }
} }
fn from_jsval(val: JSVal) -> Option<f64> { fn from_jsval(_cx: *JSContext, val: JSVal) -> Option<f64> {
unsafe { unsafe {
if RUST_JSVAL_IS_DOUBLE(val) != 0 { if RUST_JSVAL_IS_DOUBLE(val) != 0 {
Some(RUST_JSVAL_TO_DOUBLE(val) as f64) Some(RUST_JSVAL_TO_DOUBLE(val) as f64)