Skip to content

Commit d66ca2b

Browse files
committed
Backed out 11 changesets (bug 1359269) for Linting failure. CLOSED TREE
Backed out changeset 00461a29f650 (bug 1359269) Backed out changeset 6c09eccc4bd1 (bug 1359269) Backed out changeset ae30401e7988 (bug 1359269) Backed out changeset 8f9509e82439 (bug 1359269) Backed out changeset bfb153c7f9c3 (bug 1359269) Backed out changeset 1430913c5e9e (bug 1359269) Backed out changeset 4bb00dc53459 (bug 1359269) Backed out changeset 7705b1ebb154 (bug 1359269) Backed out changeset 7fd8a3c1f827 (bug 1359269) Backed out changeset c3f37539cb31 (bug 1359269) Backed out changeset bb694b612b1b (bug 1359269)
1 parent e22bf84 commit d66ca2b

35 files changed

+250
-564
lines changed

dom/bindings/Bindings.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,11 +1828,6 @@ DOMInterfaces = {
18281828
'headerFile': 'TestBindingHeader.h',
18291829
'register': False,
18301830
},
1831-
1832-
'TestAttributesOnTypes' : {
1833-
'headerFile': 'TestBindingHeader.h',
1834-
'register': False,
1835-
},
18361831
}
18371832

18381833
# These are temporary, until they've been converted to use new DOM bindings

dom/bindings/Codegen.py

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4570,6 +4570,9 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
45704570
isOptional=False,
45714571
invalidEnumValueFatal=True,
45724572
defaultValue=None,
4573+
treatNullAs="Default",
4574+
isEnforceRange=False,
4575+
isClamp=False,
45734576
isNullOrUndefined=False,
45744577
exceptionCode=None,
45754578
lenientFloatCode=None,
@@ -4647,9 +4650,6 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
46474650
# And we can't both be an object and be null or undefined
46484651
assert not isDefinitelyObject or not isNullOrUndefined
46494652

4650-
isClamp = type.clamp
4651-
isEnforceRange = type.enforceRange
4652-
46534653
# If exceptionCode is not set, we'll just rethrow the exception we got.
46544654
# Note that we can't just set failureCode to exceptionCode, because setting
46554655
# failureCode will prevent pending exceptions from being set in cases when
@@ -5788,10 +5788,6 @@ def handleNull(templateBody, setToNullVar, extraConditionForNull=""):
57885788
undefinedBehavior = "eNull"
57895789
else:
57905790
undefinedBehavior = "eStringify"
5791-
if type.treatNullAsEmpty:
5792-
treatNullAs = "EmptyString"
5793-
else:
5794-
treatNullAs = "Default"
57955791
nullBehavior = treatAs[treatNullAs]
57965792

57975793
def getConversionCode(varName):
@@ -6447,6 +6443,9 @@ def define(self):
64476443
not self.argument.variadic),
64486444
invalidEnumValueFatal=self.invalidEnumValueFatal,
64496445
defaultValue=self.argument.defaultValue,
6446+
treatNullAs=self.argument.treatNullAs,
6447+
isEnforceRange=self.argument.enforceRange,
6448+
isClamp=self.argument.clamp,
64506449
lenientFloatCode=self.lenientFloatCode,
64516450
isMember="Variadic" if self.argument.variadic else False,
64526451
allowTreatNonCallableAsNull=self.argument.allowTreatNonCallableAsNull(),
@@ -8612,6 +8611,18 @@ def __init__(self, type, interfaceMember, name="arg", allowTreatNonCallableAsNul
86128611
self.variadic = False
86138612
self.defaultValue = None
86148613
self._allowTreatNonCallableAsNull = allowTreatNonCallableAsNull
8614+
# For FakeArguments generated by maplike/setlike convenience functions,
8615+
# we won't have an interfaceMember to pass in.
8616+
if interfaceMember:
8617+
self.treatNullAs = interfaceMember.treatNullAs
8618+
else:
8619+
self.treatNullAs = "Default"
8620+
if isinstance(interfaceMember, IDLAttribute):
8621+
self.enforceRange = interfaceMember.enforceRange
8622+
self.clamp = interfaceMember.clamp
8623+
else:
8624+
self.enforceRange = False
8625+
self.clamp = False
86158626

86168627
self.identifier = FakeIdentifier(name)
86178628

@@ -11313,6 +11324,7 @@ def __init__(self, descriptor, operation, checkFound=True,
1131311324
argument = arguments[1]
1131411325
info = getJSToNativeConversionInfo(
1131511326
argument.type, descriptor,
11327+
treatNullAs=argument.treatNullAs,
1131611328
sourceDescription=("value being assigned to %s setter" %
1131711329
descriptor.interface.identifier.name))
1131811330
if argumentHandleValue is None:
@@ -13311,6 +13323,8 @@ def __init__(self, dictionary, descriptorProvider):
1331113323
getJSToNativeConversionInfo(
1331213324
member.type,
1331313325
descriptorProvider,
13326+
isEnforceRange=member.enforceRange,
13327+
isClamp=member.clamp,
1331413328
isMember="Dictionary",
1331513329
isOptional=member.canHaveMissingValue(),
1331613330
defaultValue=member.defaultValue,
@@ -16360,6 +16374,7 @@ def __init__(self, descriptor, spiderMonkeyInterfacesAreStructs=False):
1636016374

1636116375
class FakeMember():
1636216376
def __init__(self, name=None):
16377+
self.treatNullAs = "Default"
1636316378
if name is not None:
1636416379
self.identifier = FakeIdentifier(name)
1636516380

dom/bindings/GenerateCSS2PropertiesWebIDL.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# (whether camelCase, _underscorePrefixed, etc.) and the given array of
1212
# extended attributes.
1313
def generateLine(propName, extendedAttrs):
14-
return " [%s] attribute [TreatNullAs=EmptyString] DOMString %s;\n" % (", ".join(extendedAttrs),
14+
return " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
1515
propName)
1616
def generate(output, idlFilename, dataFile):
1717
propList = runpy.run_path(dataFile)["data"]
@@ -21,7 +21,7 @@ def generate(output, idlFilename, dataFile):
2121
continue
2222
# Unfortunately, even some of the getters here are fallible
2323
# (e.g. on nsComputedDOMStyle).
24-
extendedAttrs = ["CEReactions", "Throws",
24+
extendedAttrs = ["CEReactions", "Throws", "TreatNullAs=EmptyString",
2525
"SetterNeedsSubjectPrincipal=NonSystem"]
2626
if p.pref is not "":
2727
extendedAttrs.append('Pref="%s"' % p.pref)

0 commit comments

Comments
 (0)