auto merge of #2155 : Ms2ger/servo/dictionary-codegen, r=jdm

This commit is contained in:
bors-servo 2014-04-18 09:40:11 -04:00
commit 099815683d
2 changed files with 48 additions and 7 deletions

View file

@ -702,13 +702,6 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
return handleDefault(conversionCode, default)
if isMember:
# We have to make a copy, because our jsval may well not
# live as long as our string needs to.
declType = CGGeneric("DOMString")
return ("%s\n" % getConversionCode(),
declType, None, isOptional, None)
declType = "DOMString"
initialValue = None
if type.nullable():