Remove support for non-castable arguments.

src/components/script/dom/bindings/codegen/CodegenRust.py

@@ -93,7 +93,6 @@ class CastableObjectUnwrapper():
     codeOnFailure is the code to run if unwrapping fails.
     """
     def __init__(self, descriptor, source, target, codeOnFailure, isOptional=False):
-        assert descriptor.castable
         self.substitution = { "type" : descriptor.nativeType,
                               "depth": descriptor.interface.inheritanceDepth(),
                               "prototype": "PrototypeList::id::" + descriptor.name,
@@ -383,7 +382,6 @@ class CGMethodCall(CGThing):
 
 class FakeCastableDescriptor():
     def __init__(self, descriptor):
-        self.castable = True
         self.nativeType = "*%s" % descriptor.concreteType
         self.name = descriptor.name
         class FakeInterface:
@@ -630,11 +628,10 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
         typePtr = descriptor.nativeType
 
         templateBody = ""
-        if descriptor.castable:
         if descriptor.interface.isConsequential():
             raise TypeError("Consequential interface %s being used as an "
-                                "argument but flagged as castable" %
+                            "argument" % descriptor.interface.identifier.name)
-                                descriptor.interface.identifier.name)
+
         if failureCode is not None:
             templateBody += str(CastableObjectUnwrapper(
                     descriptor,
@@ -648,17 +645,6 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
                     "(${val}).to_object()",
                     "${declName}",
                     isOptional or type.nullable()))
-        else:
-            templateBody += (
-                "match unwrap_value::<" + typePtr + ">(&${val} as *JSVal, "
-                "PrototypeList::id::%s, %d) {\n" % (descriptor.name, descriptor.interface.inheritanceDepth() if descriptor.concrete else 0) +
-                "  Err(()) => {")
-            templateBody += CGIndenter(onFailureBadType(failureCode,
-                                                        descriptor.interface.identifier.name)).define()
-            templateBody += (
-                "  }\n"
-                "  Ok(unwrapped) => ${declName} = Some(unwrapped)\n"
-                "}\n")
 
         templateBody = wrapObjectTemplate(templateBody, isDefinitelyObject,
                                           type, failureCode)

src/components/script/dom/bindings/codegen/Configuration.py

@@ -137,15 +137,6 @@ class Descriptor(DescriptorProvider):
         self.concreteType = desc.get('concreteType', ifaceName)
         self.needsAbstract = desc.get('needsAbstract', [])
         self.createGlobal = desc.get('createGlobal', False)
-
-        if self.interface.isCallback():
-            if 'castable' in desc:
-                raise TypeError("%s is callback but has a castable "
-                                "setting" % self.interface.identifier.name)
-            self.castable = False
-        else:
-            self.castable = desc.get('castable', True)
-
         self.register = desc.get('register', True)
 
         # If we're concrete, we need to crawl our ancestor interfaces and mark

src/components/script/dom/bindings/utils.rs

@@ -128,13 +128,6 @@ pub fn unwrap_jsmanaged<T: Reflectable>(obj: *JSObject,
     })
 }
 
-pub fn unwrap_value<T>(val: *JSVal, proto_id: PrototypeList::id::ID, proto_depth: uint) -> Result<T, ()> {
-    unsafe {
-        let obj = (*val).to_object();
-        unwrap_object(obj, proto_id, proto_depth)
-    }
-}
-
 pub unsafe fn squirrel_away_unique<T>(x: ~T) -> *T {
     cast::transmute(x)
 }