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

Rename IsPlatformObject to is_platform_object.

Browse source
This commit is contained in:
Ms2ger 2015-01-29 19:10:51 +01:00
parent a0f5250cb8
commit 59909efff1
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -336,7 +336,7 @@ class CGMethodCall(CGThing):
# Check for vanilla JS objects # Check for vanilla JS objects
# XXXbz Do we need to worry about security wrappers? # XXXbz Do we need to worry about security wrappers?
pickFirstSignature("%s.is_object() && !IsPlatformObject(%s.to_object())" % pickFirstSignature("%s.is_object() && !is_platform_object(%s.to_object())" %
(distinguishingArg, distinguishingArg), (distinguishingArg, distinguishingArg),
lambda s: (s[1][distinguishingIndex].type.isCallback() or lambda s: (s[1][distinguishingIndex].type.isCallback() or
s[1][distinguishingIndex].type.isCallbackInterface() or s[1][distinguishingIndex].type.isCallbackInterface() or
@ -719,7 +719,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
handleInvalidEnumValueCode = "return 1;" handleInvalidEnumValueCode = "return 1;"
template = ( template = (
"match FindEnumStringIndex(cx, ${val}, %(values)s) {\n" "match find_enum_string_index(cx, ${val}, %(values)s) {\n"
" Err(_) => { %(exceptionCode)s },\n" " Err(_) => { %(exceptionCode)s },\n"
" Ok(None) => { %(handleInvalidEnumValueCode)s },\n" " Ok(None) => { %(handleInvalidEnumValueCode)s },\n"
" Ok(Some(index)) => {\n" " Ok(Some(index)) => {\n"
@ -4552,10 +4552,10 @@ class CGBindingRoot(CGThing):
'dom::bindings::utils::ConstantSpec', 'dom::bindings::utils::ConstantSpec',
'dom::bindings::utils::{DOMClass}', 'dom::bindings::utils::{DOMClass}',
'dom::bindings::utils::{DOMJSClass, JSCLASS_DOM_GLOBAL}', 'dom::bindings::utils::{DOMJSClass, JSCLASS_DOM_GLOBAL}',
'dom::bindings::utils::{FindEnumStringIndex, get_array_index_from_id}', 'dom::bindings::utils::{find_enum_string_index, get_array_index_from_id}',
'dom::bindings::utils::{get_property_on_prototype, get_proto_or_iface_array}', 'dom::bindings::utils::{get_property_on_prototype, get_proto_or_iface_array}',
'dom::bindings::utils::HasPropertyOnPrototype', 'dom::bindings::utils::HasPropertyOnPrototype',
'dom::bindings::utils::IsPlatformObject', 'dom::bindings::utils::is_platform_object',
'dom::bindings::utils::{Reflectable}', 'dom::bindings::utils::{Reflectable}',
'dom::bindings::utils::{squirrel_away_unique}', 'dom::bindings::utils::{squirrel_away_unique}',
'dom::bindings::utils::throwing_constructor', 'dom::bindings::utils::throwing_constructor',

7
components/script/dom/bindings/utils.rs
View file

@ -462,9 +462,10 @@ pub fn get_array_index_from_id(_cx: *mut JSContext, id: jsid) -> Option<u32> {
/// Find the index of a string given by `v` in `values`. /// Find the index of a string given by `v` in `values`.
/// Returns `Err(())` on JSAPI failure (there is a pending exception), and /// Returns `Err(())` on JSAPI failure (there is a pending exception), and
/// `Ok(None)` if there was no matching string. /// `Ok(None)` if there was no matching string.
pub fn FindEnumStringIndex(cx: *mut JSContext, pub fn find_enum_string_index(cx: *mut JSContext,
v: JSVal, v: JSVal,
values: &[&'static str]) -> Result<Option<uint>, ()> { values: &[&'static str])
-> Result<Option<uint>, ()> {
unsafe { unsafe {
let jsstr = JS_ValueToString(cx, v); let jsstr = JS_ValueToString(cx, v);
if jsstr.is_null() { if jsstr.is_null() {
@ -488,7 +489,7 @@ pub fn FindEnumStringIndex(cx: *mut JSContext,
/// Returns wether `obj` is a platform object /// Returns wether `obj` is a platform object
/// http://heycam.github.io/webidl/#dfn-platform-object /// http://heycam.github.io/webidl/#dfn-platform-object
pub fn IsPlatformObject(obj: *mut JSObject) -> bool { pub fn is_platform_object(obj: *mut JSObject) -> bool {
unsafe { unsafe {
// Fast-path the common case // Fast-path the common case
let mut clasp = JS_GetClass(obj); let mut clasp = JS_GetClass(obj);