766615 - Fix nullable WebIDL dictionaries

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Attachment: Patch v1

Output looks like

  const Nullable<MozXMLHttpRequestParameters> arg0;
  if ((0 < argc ? argv[0] : JSVAL_NULL).isObject()) {
    if (!const_cast<Nullable<MozXMLHttpRequestParameters>&>(arg0).SetValue().Init(cx, &(0 < argc ? argv[0] : JSVAL_NULL).toObject())) {
      return false;
    }
  } else if ((0 < argc ? argv[0] : JSVAL_NULL).isNullOrUndefined()) {
    const_cast<Nullable<MozXMLHttpRequestParameters>&>(arg0).SetNull();
  } else {
    return Throw<false>(cx, NS_ERROR_XPC_BAD_CONVERT_JS);
  }

Comment 1

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 634965 [details] [diff] [review]
Patch v1

>+            if not type.nullable():
>+                selfRef = "const_cast<%s&>(%s)" % (typeName, selfRef)

Is that if check just needed to avoid a const_cast that would be a no-op?  If so, I wouldn't bother checking, and just const_cast unconditionally.

r=me

Comment 2

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Alright, then you get

    if (!const_cast<MozXMLHttpRequestParametersWorkers&>(const_cast<Nullable<MozXMLHttpRequestParametersWorkers>&>(arg0).SetValue()).Init(cx, &(0 < argc ? argv[0] : JSVAL_NULL).toObject())) {

Comment 3

[Boris Zbarsky [:bzbarsky]]

> Alright, then you get

Yep.  Looks good to me!  ;)

Comment 4

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

https://hg.mozilla.org/mozilla-central/rev/829ce8dbcf65