Backed out changeset 1b9fcdd5dd97 (bug 1368949) because more code got added that doesn't build with it.

This commit is contained in:
Boris Zbarsky 2018-09-25 18:14:39 -04:00
Родитель 3e68321279
Коммит 4cdbc6f15a
9 изменённых файлов: 37 добавлений и 75 удалений

Просмотреть файл

@ -5969,13 +5969,12 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
return handleJSObjectType(type, isMember, failureCode, exceptionCode, sourceDescription)
if type.isDictionary():
# There are no nullable dictionary-typed arguments or dictionary-typed
# dictionary members.
# There are no nullable dictionary arguments or dictionary members
assert(not type.nullable() or isCallbackReturnValue or
(isMember and isMember != "Dictionary"))
# All optional dictionary-typed arguments always have default values,
# but dictionary-typed dictionary members can be optional.
assert not isOptional or isMember == "Dictionary"
# All optional dictionaries always have default values, so we
# should be able to assume not isOptional here.
assert not isOptional
# In the callback return value case we never have to worry
# about a default value; we always have a value.
assert not isCallbackReturnValue or defaultValue is None
@ -6056,8 +6055,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
declArgs = None
return JSToNativeConversionInfo(template, declType=declType,
declArgs=declArgs,
dealWithOptional=isOptional)
declArgs=declArgs)
if type.isVoid():
assert not isOptional

Просмотреть файл

@ -4526,9 +4526,8 @@ class IDLArgument(IDLObjectWithIdentifier):
if ((self.type.isDictionary() or
self.type.isUnion() and self.type.unroll().hasDictionaryType()) and
self.optional and not self.defaultValue and not self.variadic and
not self.dictionaryMember):
# Default optional non-variadic dictionary arguments to null,
self.optional and not self.defaultValue and not self.variadic):
# Default optional non-variadic dictionaries to null,
# for simplicity, so the codegen doesn't have to special-case this.
self.defaultValue = IDLNullValue(self.location)
elif self.type.isAny():

Просмотреть файл

@ -20,7 +20,5 @@ dictionary CSPReportProperties {
};
dictionary CSPReport {
// We always want to have a "csp-report" property, so just pre-initialize it
// to an empty dictionary..
CSPReportProperties csp-report = null;
CSPReportProperties csp-report;
};

Просмотреть файл

@ -26,13 +26,11 @@ interface CredentialsContainer {
};
dictionary CredentialRequestOptions {
// FIXME: bug 1493860: should this "= null" be here?
PublicKeyCredentialRequestOptions publicKey = null;
PublicKeyCredentialRequestOptions publicKey;
AbortSignal signal;
};
dictionary CredentialCreationOptions {
// FIXME: bug 1493860: should this "= null" be here?
PublicKeyCredentialCreationOptions publicKey = null;
PublicKeyCredentialCreationOptions publicKey;
AbortSignal signal;
};

Просмотреть файл

@ -2,8 +2,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/.
*
* https://w3c.github.io/deviceorientation/
*/
[NoInterfaceObject]
@ -41,12 +39,9 @@ dictionary DeviceRotationRateInit {
};
dictionary DeviceMotionEventInit : EventInit {
// FIXME: bug 1493860: should this "= null" be here?
DeviceAccelerationInit acceleration = null;
// FIXME: bug 1493860: should this "= null" be here?
DeviceAccelerationInit accelerationIncludingGravity = null;
// FIXME: bug 1493860: should this "= null" be here?
DeviceRotationRateInit rotationRate = null;
DeviceAccelerationInit acceleration;
DeviceAccelerationInit accelerationIncludingGravity;
DeviceRotationRateInit rotationRate;
double? interval = null;
};

Просмотреть файл

@ -42,41 +42,26 @@ typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) Const
// function in MediaManager.cpp to make OverconstrainedError's constraint work!
dictionary MediaTrackConstraintSet {
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong width = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong height = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainDouble frameRate = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainDOMString facingMode = null;
ConstrainLong width;
ConstrainLong height;
ConstrainDouble frameRate;
ConstrainDOMString facingMode;
DOMString mediaSource = "camera";
long long browserWindow;
boolean scrollWithPage;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainDOMString deviceId = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong viewportOffsetX = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong viewportOffsetY = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong viewportWidth = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong viewportHeight = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainBoolean echoCancellation = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainBoolean noiseSuppression = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainBoolean autoGainControl = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainLong channelCount = null;
ConstrainDOMString deviceId;
ConstrainLong viewportOffsetX;
ConstrainLong viewportOffsetY;
ConstrainLong viewportWidth;
ConstrainLong viewportHeight;
ConstrainBoolean echoCancellation;
ConstrainBoolean noiseSuppression;
ConstrainBoolean autoGainControl;
ConstrainLong channelCount;
// Deprecated with warnings:
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainBoolean mozNoiseSuppression = null;
// FIXME: bug 1493860 or bug 1493798: should this "= null" be here?
ConstrainBoolean mozAutoGainControl = null;
ConstrainBoolean mozNoiseSuppression;
ConstrainBoolean mozAutoGainControl;
};
dictionary MediaTrackConstraints : MediaTrackConstraintSet {

Просмотреть файл

@ -41,8 +41,7 @@ dictionary PaymentShippingOption {
dictionary PaymentDetailsModifier {
required DOMString supportedMethods;
// FIXME: bug 1493860: should this "= null" be here?
PaymentItem total = null;
PaymentItem total;
sequence<PaymentItem> additionalDisplayItems;
object data;
};
@ -87,13 +86,10 @@ dictionary PayerErrorFields {
dictionary PaymentDetailsUpdate : PaymentDetailsBase {
DOMString error;
// FIXME: bug 1493860: should this "= null" be here?
AddressErrors shippingAddressErrors = null;
// FIXME: bug 1493860: should this "= null" be here?
PayerErrorFields payerErrors = null;
AddressErrors shippingAddressErrors;
PayerErrorFields payerErrors;
object paymentMethodErrors;
// FIXME: bug 1493860: should this "= null" be here?
PaymentItem total = null;
PaymentItem total;
};
enum PaymentShippingType {

Просмотреть файл

@ -24,10 +24,7 @@ dictionary PushSubscriptionKeys
dictionary PushSubscriptionJSON
{
USVString endpoint;
// FIXME: bug 1493860: should this "= null" be here? For that matter, this
// PushSubscriptionKeys thing is not even in the spec; "keys" is a record
// there.
PushSubscriptionKeys keys = null;
PushSubscriptionKeys keys;
};
dictionary PushSubscriptionInit

Просмотреть файл

@ -52,11 +52,9 @@ dictionary PublicKeyCredentialCreationOptions {
unsigned long timeout;
sequence<PublicKeyCredentialDescriptor> excludeCredentials = [];
// FIXME: bug 1493860: should this "= null" be here?
AuthenticatorSelectionCriteria authenticatorSelection = null;
AuthenticatorSelectionCriteria authenticatorSelection;
AttestationConveyancePreference attestation = "none";
// FIXME: bug 1493860: should this "= null" be here?
AuthenticationExtensionsClientInputs extensions = null;
AuthenticationExtensionsClientInputs extensions;
};
dictionary PublicKeyCredentialEntity {
@ -102,8 +100,7 @@ dictionary PublicKeyCredentialRequestOptions {
USVString rpId;
sequence<PublicKeyCredentialDescriptor> allowCredentials = [];
UserVerificationRequirement userVerification = "preferred";
// FIXME: bug 1493860: should this "= null" be here?
AuthenticationExtensionsClientInputs extensions = null;
AuthenticationExtensionsClientInputs extensions;
};
// TODO - Use partial dictionaries when bug 1436329 is fixed.
@ -128,8 +125,7 @@ dictionary CollectedClientData {
required DOMString origin;
required DOMString hashAlgorithm;
DOMString tokenBindingId;
// FIXME: bug 1493860: should this "= null" be here?
AuthenticationExtensionsClientInputs clientExtensions = null;
AuthenticationExtensionsClientInputs clientExtensions;
AuthenticationExtensionsAuthenticatorInputs authenticatorExtensions;
};