Bug 1077393 - Rename ScalarValueString to USVString. r=smaug

--HG--
rename : dom/bindings/parser/tests/test_scalarvaluestring.py => dom/bindings/parser/tests/test_usvstring.py
rename : dom/bindings/test/test_scalarvaluestring.html => dom/bindings/test/test_usvstring.html
This commit is contained in:
Andrea Marchesini 2014-11-20 12:58:00 +01:00
parent 6cdafcd86f
commit 8883a53fd9
39 changed files with 205 additions and 205 deletions

View File

@ -6370,7 +6370,7 @@ nsGlobalWindow::Confirm(const nsAString& aString, bool* aReturn)
}
already_AddRefed<Promise>
nsGlobalWindow::Fetch(const RequestOrScalarValueString& aInput,
nsGlobalWindow::Fetch(const RequestOrUSVString& aInput,
const RequestInit& aInit, ErrorResult& aRv)
{
return FetchRequest(this, aInput, aInit, aRv);

View File

@ -110,7 +110,7 @@ class Navigator;
class OwningExternalOrWindowProxy;
class Promise;
struct RequestInit;
class RequestOrScalarValueString;
class RequestOrUSVString;
class Selection;
class SpeechSynthesis;
class WakeLock;
@ -857,7 +857,7 @@ public:
void Alert(mozilla::ErrorResult& aError);
void Alert(const nsAString& aMessage, mozilla::ErrorResult& aError);
bool Confirm(const nsAString& aMessage, mozilla::ErrorResult& aError);
already_AddRefed<mozilla::dom::Promise> Fetch(const mozilla::dom::RequestOrScalarValueString& aInput,
already_AddRefed<mozilla::dom::Promise> Fetch(const mozilla::dom::RequestOrUSVString& aInput,
const mozilla::dom::RequestInit& aInit,
mozilla::ErrorResult& aRv);
void Prompt(const nsAString& aMessage, const nsAString& aInitial,

View File

@ -2142,7 +2142,7 @@ NonVoidByteStringToJsval(JSContext *cx, const nsACString &str,
template<typename T> static void
NormalizeScalarValueStringInternal(JSContext* aCx, T& aString)
NormalizeUSVStringInternal(JSContext* aCx, T& aString)
{
char16_t* start = aString.BeginWriting();
// Must use const here because we can't pass char** to UTF16CharEnumerator as
@ -2159,15 +2159,15 @@ NormalizeScalarValueStringInternal(JSContext* aCx, T& aString)
}
void
NormalizeScalarValueString(JSContext* aCx, nsAString& aString)
NormalizeUSVString(JSContext* aCx, nsAString& aString)
{
NormalizeScalarValueStringInternal(aCx, aString);
NormalizeUSVStringInternal(aCx, aString);
}
void
NormalizeScalarValueString(JSContext* aCx, binding_detail::FakeString& aString)
NormalizeUSVString(JSContext* aCx, binding_detail::FakeString& aString)
{
NormalizeScalarValueStringInternal(aCx, aString);
NormalizeUSVStringInternal(aCx, aString);
}
bool

View File

@ -1923,10 +1923,10 @@ ConvertJSValueToString(JSContext* cx, JS::Handle<JS::Value> v,
}
void
NormalizeScalarValueString(JSContext* aCx, nsAString& aString);
NormalizeUSVString(JSContext* aCx, nsAString& aString);
void
NormalizeScalarValueString(JSContext* aCx, binding_detail::FakeString& aString);
NormalizeUSVString(JSContext* aCx, binding_detail::FakeString& aString);
template<typename T>
inline bool

View File

@ -4837,7 +4837,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
declArgs=declArgs,
holderArgs=holderArgs)
if type.isDOMString() or type.isScalarValueString():
if type.isDOMString() or type.isUSVString():
assert not isEnforceRange and not isClamp
treatAs = {
@ -4856,8 +4856,8 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
def getConversionCode(varName):
normalizeCode = ""
if type.isScalarValueString():
normalizeCode = "NormalizeScalarValueString(cx, %s);\n" % varName
if type.isUSVString():
normalizeCode = "NormalizeUSVString(cx, %s);\n" % varName
conversionCode = (
"if (!ConvertJSValueToString(cx, ${val}, %s, %s, %s)) {\n"
@ -5797,7 +5797,7 @@ def getWrapTemplateForType(type, descriptorProvider, result, successCode,
wrappingCode += wrapAndSetPtr(wrap, failed)
return (wrappingCode, False)
if type.isDOMString() or type.isScalarValueString():
if type.isDOMString() or type.isUSVString():
if type.nullable():
return (wrapAndSetPtr("xpc::StringToJsval(cx, %s, ${jsvalHandle})" % result), False)
else:
@ -6077,7 +6077,7 @@ def getRetvalDeclarationForType(returnType, descriptorProvider,
if returnType.nullable():
result = CGTemplatedType("Nullable", result)
return result, None, None, None, None
if returnType.isDOMString() or returnType.isScalarValueString():
if returnType.isDOMString() or returnType.isUSVString():
if isMember:
return CGGeneric("nsString"), "ref", None, None, None
return CGGeneric("DOMString"), "ref", None, None, None
@ -8488,7 +8488,7 @@ def getUnionAccessorSignatureType(type, descriptorProvider):
typeName = CGGeneric(type.name)
return CGWrapper(typeName, post=" const &")
if type.isDOMString() or type.isScalarValueString():
if type.isDOMString() or type.isUSVString():
return CGGeneric("const nsAString&")
if type.isByteString():
@ -12467,7 +12467,7 @@ class CGNativeMember(ClassMethod):
return (result.define(),
"%s(%s)" % (result.define(), defaultReturnArg),
"return ${declName};\n")
if type.isDOMString() or type.isScalarValueString():
if type.isDOMString() or type.isUSVString():
if isMember:
# No need for a third element in the isMember case
return "nsString", None, None
@ -12587,7 +12587,7 @@ class CGNativeMember(ClassMethod):
def getArgs(self, returnType, argList):
args = [self.getArg(arg) for arg in argList]
# Now the outparams
if returnType.isDOMString() or returnType.isScalarValueString():
if returnType.isDOMString() or returnType.isUSVString():
args.append(Argument("nsString&", "aRetVal"))
elif returnType.isByteString():
args.append(Argument("nsCString&", "aRetVal"))
@ -12714,7 +12714,7 @@ class CGNativeMember(ClassMethod):
# Unroll for the name, in case we're nullable.
return type.unroll().name, True, True
if type.isDOMString() or type.isScalarValueString():
if type.isDOMString() or type.isUSVString():
if isMember:
declType = "nsString"
else:
@ -14587,7 +14587,7 @@ class CGEventGetter(CGNativeMember):
memberName = CGDictionary.makeMemberName(self.member.identifier.name)
if (type.isPrimitive() and type.tag() in builtinNames) or type.isEnum() or type.isGeckoInterface():
return "return " + memberName + ";\n"
if type.isDOMString() or type.isByteString() or type.isScalarValueString():
if type.isDOMString() or type.isByteString() or type.isUSVString():
return "aRetVal = " + memberName + ";\n"
if type.isSpiderMonkeyInterface() or type.isObject():
return fill(
@ -14980,7 +14980,7 @@ class CGEventClass(CGBindingImplClass):
nativeType = CGGeneric(type.unroll().inner.identifier.name)
if type.nullable():
nativeType = CGTemplatedType("Nullable", nativeType)
elif type.isDOMString() or type.isScalarValueString():
elif type.isDOMString() or type.isUSVString():
nativeType = CGGeneric("nsString")
elif type.isByteString():
nativeType = CGGeneric("nsCString")

View File

@ -1572,7 +1572,7 @@ class IDLType(IDLObject):
'any',
'domstring',
'bytestring',
'scalarvaluestring',
'usvstring',
'object',
'date',
'void',
@ -1625,7 +1625,7 @@ class IDLType(IDLObject):
def isDOMString(self):
return False
def isScalarValueString(self):
def isUSVString(self):
return False
def isVoid(self):
@ -1811,8 +1811,8 @@ class IDLNullableType(IDLType):
def isDOMString(self):
return self.inner.isDOMString()
def isScalarValueString(self):
return self.inner.isScalarValueString()
def isUSVString(self):
return self.inner.isUSVString()
def isFloat(self):
return self.inner.isFloat()
@ -1939,7 +1939,7 @@ class IDLSequenceType(IDLType):
def isDOMString(self):
return False
def isScalarValueString(self):
def isUSVString(self):
return False
def isVoid(self):
@ -2213,7 +2213,7 @@ class IDLArrayType(IDLType):
def isDOMString(self):
return False
def isScalarValueString(self):
def isUSVString(self):
return False
def isVoid(self):
@ -2311,8 +2311,8 @@ class IDLTypedefType(IDLType, IDLObjectWithIdentifier):
def isDOMString(self):
return self.inner.isDOMString()
def isScalarValueString(self):
return self.inner.isScalarValueString()
def isUSVString(self):
return self.inner.isUSVString()
def isVoid(self):
return self.inner.isVoid()
@ -2412,7 +2412,7 @@ class IDLWrapperType(IDLType):
def isDOMString(self):
return False
def isScalarValueString(self):
def isUSVString(self):
return False
def isVoid(self):
@ -2566,7 +2566,7 @@ class IDLBuiltinType(IDLType):
'any',
'domstring',
'bytestring',
'scalarvaluestring',
'usvstring',
'object',
'date',
'void',
@ -2601,7 +2601,7 @@ class IDLBuiltinType(IDLType):
Types.any: IDLType.Tags.any,
Types.domstring: IDLType.Tags.domstring,
Types.bytestring: IDLType.Tags.bytestring,
Types.scalarvaluestring: IDLType.Tags.scalarvaluestring,
Types.usvstring: IDLType.Tags.usvstring,
Types.object: IDLType.Tags.object,
Types.date: IDLType.Tags.date,
Types.void: IDLType.Tags.void,
@ -2635,7 +2635,7 @@ class IDLBuiltinType(IDLType):
def isString(self):
return self._typeTag == IDLBuiltinType.Types.domstring or \
self._typeTag == IDLBuiltinType.Types.bytestring or \
self._typeTag == IDLBuiltinType.Types.scalarvaluestring
self._typeTag == IDLBuiltinType.Types.usvstring
def isByteString(self):
return self._typeTag == IDLBuiltinType.Types.bytestring
@ -2643,8 +2643,8 @@ class IDLBuiltinType(IDLType):
def isDOMString(self):
return self._typeTag == IDLBuiltinType.Types.domstring
def isScalarValueString(self):
return self._typeTag == IDLBuiltinType.Types.scalarvaluestring
def isUSVString(self):
return self._typeTag == IDLBuiltinType.Types.usvstring
def isInteger(self):
return self._typeTag <= IDLBuiltinType.Types.unsigned_long_long
@ -2798,9 +2798,9 @@ BuiltinTypes = {
IDLBuiltinType.Types.bytestring:
IDLBuiltinType(BuiltinLocation("<builtin type>"), "ByteString",
IDLBuiltinType.Types.bytestring),
IDLBuiltinType.Types.scalarvaluestring:
IDLBuiltinType(BuiltinLocation("<builtin type>"), "ScalarValueString",
IDLBuiltinType.Types.scalarvaluestring),
IDLBuiltinType.Types.usvstring:
IDLBuiltinType(BuiltinLocation("<builtin type>"), "USVString",
IDLBuiltinType.Types.usvstring),
IDLBuiltinType.Types.object:
IDLBuiltinType(BuiltinLocation("<builtin type>"), "Object",
IDLBuiltinType.Types.object),
@ -2935,10 +2935,10 @@ class IDLValue(IDLObject):
raise WebIDLError("Trying to convert unrestricted value %s to non-unrestricted"
% self.value, [location]);
return self
elif self.type.isString() and type.isScalarValueString():
# Allow ScalarValueStrings to use default value just like
elif self.type.isString() and type.isUSVString():
# Allow USVStrings to use default value just like
# DOMString. No coercion is required in this case as Codegen.py
# treats ScalarValueString just like DOMString, but with an
# treats USVString just like DOMString, but with an
# extra normalization step.
assert self.type.isDOMString()
return self
@ -4168,7 +4168,7 @@ class Tokenizer(object):
"Date": "DATE",
"DOMString": "DOMSTRING",
"ByteString": "BYTESTRING",
"ScalarValueString": "SCALARVALUESTRING",
"USVString": "USVSTRING",
"any": "ANY",
"boolean": "BOOLEAN",
"byte": "BYTE",
@ -5132,7 +5132,7 @@ class Parser(Tokenizer):
| DATE
| DOMSTRING
| BYTESTRING
| SCALARVALUESTRING
| USVSTRING
| ANY
| ATTRIBUTE
| BOOLEAN
@ -5405,11 +5405,11 @@ class Parser(Tokenizer):
"""
p[0] = IDLBuiltinType.Types.bytestring
def p_PrimitiveOrStringTypeScalarValueString(self, p):
def p_PrimitiveOrStringTypeUSVString(self, p):
"""
PrimitiveOrStringType : SCALARVALUESTRING
PrimitiveOrStringType : USVSTRING
"""
p[0] = IDLBuiltinType.Types.scalarvaluestring
p[0] = IDLBuiltinType.Types.usvstring
def p_UnsignedIntegerTypeUnsigned(self, p):
"""

View File

@ -160,7 +160,7 @@ def WebIDLTest(parser, harness):
"optional Dict2", "sequence<long>", "sequence<short>",
"MozMap<object>", "MozMap<Dict>", "MozMap<long>",
"long[]", "short[]", "Date", "Date?", "any",
"ScalarValueString" ]
"USVString" ]
# When we can parse Date and RegExp, we need to add them here.
# Try to categorize things a bit to keep list lengths down
@ -171,7 +171,7 @@ def WebIDLTest(parser, harness):
primitives = numerics + booleans
nonNumerics = allBut(argTypes, numerics)
nonBooleans = allBut(argTypes, booleans)
strings = [ "DOMString", "ByteString", "Enum", "Enum2", "ScalarValueString" ]
strings = [ "DOMString", "ByteString", "Enum", "Enum2", "USVString" ]
nonStrings = allBut(argTypes, strings)
nonObjects = primitives + strings
objects = allBut(argTypes, nonObjects )
@ -206,7 +206,7 @@ def WebIDLTest(parser, harness):
setDistinguishable("boolean?", allBut(nonBooleans, nullables))
setDistinguishable("DOMString", nonStrings)
setDistinguishable("ByteString", nonStrings)
setDistinguishable("ScalarValueString", nonStrings)
setDistinguishable("USVString", nonStrings)
setDistinguishable("Enum", nonStrings)
setDistinguishable("Enum2", nonStrings)
setDistinguishable("Interface", notRelatedInterfaces)

View File

@ -63,7 +63,7 @@ def WebIDLTest(parser, harness):
"octet",
"DOMString",
"ByteString",
"ScalarValueString",
"USVString",
#"sequence<float>",
"object",
"ArrayBuffer",

View File

@ -4,8 +4,8 @@ import WebIDL
def WebIDLTest(parser, harness):
parser.parse("""
interface TestScalarValueString {
attribute ScalarValueString svs;
interface TestUSVString {
attribute USVString svs;
};
""")
@ -15,9 +15,9 @@ def WebIDLTest(parser, harness):
harness.ok(isinstance(results[0], WebIDL.IDLInterface),
"Should be an IDLInterface")
iface = results[0]
harness.check(iface.identifier.QName(), "::TestScalarValueString",
harness.check(iface.identifier.QName(), "::TestUSVString",
"Interface has the right QName")
harness.check(iface.identifier.name, "TestScalarValueString",
harness.check(iface.identifier.name, "TestUSVString",
"Interface has the right name")
harness.check(iface.parent, None, "Interface has no parent")
@ -26,11 +26,11 @@ def WebIDLTest(parser, harness):
attr = members[0]
harness.ok(isinstance(attr, WebIDL.IDLAttribute), "Should be an IDLAttribute")
harness.check(attr.identifier.QName(), "::TestScalarValueString::svs",
harness.check(attr.identifier.QName(), "::TestUSVString::svs",
"Attr has correct QName")
harness.check(attr.identifier.name, "svs", "Attr has correct name")
harness.check(str(attr.type), "ScalarValueString",
harness.check(str(attr.type), "USVString",
"Attr type is the correct name")
harness.ok(attr.type.isScalarValueString(), "Should be ScalarValueString type")
harness.ok(attr.type.isUSVString(), "Should be USVString type")
harness.ok(attr.type.isString(), "Should be String collective type")
harness.ok(not attr.type.isDOMString(), "Should be not be DOMString type")

View File

@ -480,15 +480,15 @@ public:
void PassOptionalNullableByteString(const Optional<nsCString>&);
void PassVariadicByteString(const Sequence<nsCString>&);
// ScalarValueString types
void PassSVS(const nsAString&);
void PassNullableSVS(const nsAString&);
void PassOptionalSVS(const Optional<nsAString>&);
void PassOptionalSVSWithDefaultValue(const nsAString&);
void PassOptionalNullableSVS(const Optional<nsAString>&);
void PassOptionalNullableSVSWithDefaultValue(const nsAString&);
void PassVariadicSVS(const Sequence<nsString>&);
void ReceiveSVS(DOMString&);
// USVString types
void PassUSVS(const nsAString&);
void PassNullableUSVS(const nsAString&);
void PassOptionalUSVS(const Optional<nsAString>&);
void PassOptionalUSVSWithDefaultValue(const nsAString&);
void PassOptionalNullableUSVS(const Optional<nsAString>&);
void PassOptionalNullableUSVSWithDefaultValue(const nsAString&);
void PassVariadicUSVS(const Sequence<nsString>&);
void ReceiveUSVS(DOMString&);
// Enumerated types
void PassEnum(TestEnum);
@ -613,7 +613,7 @@ public:
void PassUnionWithMozMap(const StringMozMapOrString&);
void PassUnionWithMozMapAndSequence(const StringMozMapOrStringSequence&);
void PassUnionWithSequenceAndMozMap(const StringSequenceOrStringMozMap&);
void PassUnionWithSVS(const ScalarValueStringOrLong&);
void PassUnionWithUSVS(const USVStringOrLong&);
#endif
void PassNullableUnion(JSContext*, const Nullable<ObjectOrLong>&);
void PassOptionalUnion(JSContext*, const Optional<ObjectOrLong>&);

View File

@ -460,15 +460,15 @@ interface TestInterface {
void passOptionalNullableByteString(optional ByteString? arg);
void passVariadicByteString(ByteString... arg);
// ScalarValueString types
void passSVS(ScalarValueString arg);
void passNullableSVS(ScalarValueString? arg);
void passOptionalSVS(optional ScalarValueString arg);
void passOptionalSVSWithDefaultValue(optional ScalarValueString arg = "abc");
void passOptionalNullableSVS(optional ScalarValueString? arg);
void passOptionalNullableSVSWithDefaultValue(optional ScalarValueString? arg = null);
void passVariadicSVS(ScalarValueString... arg);
ScalarValueString receiveSVS();
// USVString types
void passUSVS(USVString arg);
void passNullableUSVS(USVString? arg);
void passOptionalUSVS(optional USVString arg);
void passOptionalUSVSWithDefaultValue(optional USVString arg = "abc");
void passOptionalNullableUSVS(optional USVString? arg);
void passOptionalNullableUSVSWithDefaultValue(optional USVString? arg = null);
void passVariadicUSVS(USVString... arg);
USVString receiveUSVS();
// Enumerated types
void passEnum(TestEnum arg);
@ -578,7 +578,7 @@ interface TestInterface {
void passUnionWithMozMap((MozMap<DOMString> or DOMString) arg);
void passUnionWithMozMapAndSequence((MozMap<DOMString> or sequence<DOMString>) arg);
void passUnionWithSequenceAndMozMap((sequence<DOMString> or MozMap<DOMString>) arg);
void passUnionWithSVS((ScalarValueString or long) arg);
void passUnionWithUSVS((USVString or long) arg);
#endif
void passUnionWithNullable((object? or long) arg);
void passNullableUnion((object or long)? arg);

View File

@ -327,15 +327,15 @@ interface TestExampleInterface {
void passVariadicByteString(ByteString... arg);
void passUnionByteString((ByteString or long) arg);
// ScalarValueString types
void passSVS(ScalarValueString arg);
void passNullableSVS(ScalarValueString? arg);
void passOptionalSVS(optional ScalarValueString arg);
void passOptionalSVSWithDefaultValue(optional ScalarValueString arg = "abc");
void passOptionalNullableSVS(optional ScalarValueString? arg);
void passOptionalNullableSVSWithDefaultValue(optional ScalarValueString? arg = null);
void passVariadicSVS(ScalarValueString... arg);
ScalarValueString receiveSVS();
// USVString types
void passSVS(USVString arg);
void passNullableSVS(USVString? arg);
void passOptionalSVS(optional USVString arg);
void passOptionalSVSWithDefaultValue(optional USVString arg = "abc");
void passOptionalNullableSVS(optional USVString? arg);
void passOptionalNullableSVSWithDefaultValue(optional USVString? arg = null);
void passVariadicSVS(USVString... arg);
USVString receiveSVS();
// Enumerated types
void passEnum(TestEnum arg);
@ -443,7 +443,7 @@ interface TestExampleInterface {
void passUnionWithMozMap((MozMap<DOMString> or DOMString) arg);
void passUnionWithMozMapAndSequence((MozMap<DOMString> or sequence<DOMString>) arg);
void passUnionWithSequenceAndMozMap((sequence<DOMString> or MozMap<DOMString>) arg);
void passUnionWithSVS((ScalarValueString or long) arg);
void passUnionWithSVS((USVString or long) arg);
#endif
void passUnionWithNullable((object? or long) arg);
void passNullableUnion((object or long)? arg);

View File

@ -339,15 +339,15 @@ interface TestJSImplInterface {
void passVariadicByteString(ByteString... arg);
void PassUnionByteString((ByteString or long) arg);
// ScalarValueString types
void passSVS(ScalarValueString arg);
void passNullableSVS(ScalarValueString? arg);
void passOptionalSVS(optional ScalarValueString arg);
void passOptionalSVSWithDefaultValue(optional ScalarValueString arg = "abc");
void passOptionalNullableSVS(optional ScalarValueString? arg);
void passOptionalNullableSVSWithDefaultValue(optional ScalarValueString? arg = null);
void passVariadicSVS(ScalarValueString... arg);
ScalarValueString receiveSVS();
// USVString types
void passSVS(USVString arg);
void passNullableSVS(USVString? arg);
void passOptionalSVS(optional USVString arg);
void passOptionalSVSWithDefaultValue(optional USVString arg = "abc");
void passOptionalNullableSVS(optional USVString? arg);
void passOptionalNullableSVSWithDefaultValue(optional USVString? arg = null);
void passVariadicSVS(USVString... arg);
USVString receiveSVS();
// Enumerated types
void passEnum(MyTestEnum arg);
@ -456,7 +456,7 @@ interface TestJSImplInterface {
void passUnionWithMozMap((MozMap<DOMString> or DOMString) arg);
void passUnionWithMozMapAndSequence((MozMap<DOMString> or sequence<DOMString>) arg);
void passUnionWithSequenceAndMozMap((sequence<DOMString> or MozMap<DOMString>) arg);
void passUnionWithSVS((ScalarValueString or long) arg);
void passUnionWithSVS((USVString or long) arg);
#endif
void passUnionWithNullable((object? or long) arg);
void passNullableUnion((object or long)? arg);

View File

@ -44,7 +44,7 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only failure; bug 926547
[test_queryInterface.html]
[test_returnUnion.html]
skip-if = debug == false
[test_scalarvaluestring.html]
[test_usvstring.html]
skip-if = debug == false
[test_sequence_wrapping.html]
[test_setWithNamedGetterNoNamedSetter.html]

View File

@ -3,7 +3,7 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test ScalarValueString</title>
<title>Test USVString</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>

View File

@ -112,7 +112,7 @@ public:
};
already_AddRefed<Promise>
FetchRequest(nsIGlobalObject* aGlobal, const RequestOrScalarValueString& aInput,
FetchRequest(nsIGlobalObject* aGlobal, const RequestOrUSVString& aInput,
const RequestInit& aInit, ErrorResult& aRv)
{
nsRefPtr<Promise> p = Promise::Create(aGlobal, aRv);
@ -316,7 +316,7 @@ ExtractFromBlob(const File& aFile, nsIInputStream** aStream,
}
nsresult
ExtractFromScalarValueString(const nsString& aStr,
ExtractFromUSVString(const nsString& aStr,
nsIInputStream** aStream,
nsCString& aContentType)
{
@ -365,7 +365,7 @@ ExtractFromURLSearchParams(const URLSearchParams& aParams,
}
nsresult
ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
nsIInputStream** aStream,
nsCString& aContentType)
{
@ -380,10 +380,10 @@ ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalar
} else if (aBodyInit.IsBlob()) {
const File& blob = aBodyInit.GetAsBlob();
return ExtractFromBlob(blob, aStream, aContentType);
} else if (aBodyInit.IsScalarValueString()) {
} else if (aBodyInit.IsUSVString()) {
nsAutoString str;
str.Assign(aBodyInit.GetAsScalarValueString());
return ExtractFromScalarValueString(str, aStream, aContentType);
str.Assign(aBodyInit.GetAsUSVString());
return ExtractFromUSVString(str, aStream, aContentType);
} else if (aBodyInit.IsURLSearchParams()) {
URLSearchParams& params = aBodyInit.GetAsURLSearchParams();
return ExtractFromURLSearchParams(params, aStream, aContentType);
@ -394,7 +394,7 @@ ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalar
}
nsresult
ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
nsIInputStream** aStream,
nsCString& aContentType)
{
@ -409,10 +409,10 @@ ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrScalarValueS
} else if (aBodyInit.IsBlob()) {
const File& blob = aBodyInit.GetAsBlob();
return ExtractFromBlob(blob, aStream, aContentType);
} else if (aBodyInit.IsScalarValueString()) {
} else if (aBodyInit.IsUSVString()) {
nsAutoString str;
str.Assign(aBodyInit.GetAsScalarValueString());
return ExtractFromScalarValueString(str, aStream, aContentType);
str.Assign(aBodyInit.GetAsUSVString());
return ExtractFromUSVString(str, aStream, aContentType);
} else if (aBodyInit.IsURLSearchParams()) {
URLSearchParams& params = aBodyInit.GetAsURLSearchParams();
return ExtractFromURLSearchParams(params, aStream, aContentType);

View File

@ -18,18 +18,18 @@ class nsIGlobalObject;
namespace mozilla {
namespace dom {
class ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams;
class ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams;
class InternalRequest;
class OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams;
class OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams;
class Promise;
class RequestOrScalarValueString;
class RequestOrUSVString;
namespace workers {
class WorkerPrivate;
} // namespace workers
already_AddRefed<Promise>
FetchRequest(nsIGlobalObject* aGlobal, const RequestOrScalarValueString& aInput,
FetchRequest(nsIGlobalObject* aGlobal, const RequestOrUSVString& aInput,
const RequestInit& aInit, ErrorResult& aRv);
nsresult
@ -41,7 +41,7 @@ GetRequestReferrer(nsIGlobalObject* aGlobal, const InternalRequest* aRequest, ns
* Stores content type in out param aContentType.
*/
nsresult
ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
nsIInputStream** aStream,
nsCString& aContentType);
@ -49,7 +49,7 @@ ExtractByteStreamFromBody(const OwningArrayBufferOrArrayBufferViewOrBlobOrScalar
* Non-owning version.
*/
nsresult
ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& aBodyInit,
ExtractByteStreamFromBody(const ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& aBodyInit,
nsIInputStream** aStream,
nsCString& aContentType);

View File

@ -49,7 +49,7 @@ Request::GetInternalRequest()
/*static*/ already_AddRefed<Request>
Request::Constructor(const GlobalObject& aGlobal,
const RequestOrScalarValueString& aInput,
const RequestOrUSVString& aInput,
const RequestInit& aInit, ErrorResult& aRv)
{
nsRefPtr<InternalRequest> request;
@ -76,9 +76,9 @@ Request::Constructor(const GlobalObject& aGlobal,
RequestMode fallbackMode = RequestMode::EndGuard_;
RequestCredentials fallbackCredentials = RequestCredentials::EndGuard_;
if (aInput.IsScalarValueString()) {
if (aInput.IsUSVString()) {
nsString input;
input.Assign(aInput.GetAsScalarValueString());
input.Assign(aInput.GetAsUSVString());
nsString requestURL;
if (NS_IsMainThread()) {
@ -191,7 +191,7 @@ Request::Constructor(const GlobalObject& aGlobal,
}
if (aInit.mBody.WasPassed()) {
const OwningArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams& bodyInit = aInit.mBody.Value();
const OwningArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams& bodyInit = aInit.mBody.Value();
nsCOMPtr<nsIInputStream> stream;
nsCString contentType;
aRv = ExtractByteStreamFromBody(bodyInit,

View File

@ -23,7 +23,7 @@ namespace dom {
class Headers;
class InternalHeaders;
class Promise;
class RequestOrScalarValueString;
class RequestOrUSVString;
class Request MOZ_FINAL : public nsISupports
, public nsWrapperCache
@ -89,7 +89,7 @@ public:
GetBody(nsIInputStream** aStream) { return mRequest->GetBody(aStream); }
static already_AddRefed<Request>
Constructor(const GlobalObject& aGlobal, const RequestOrScalarValueString& aInput,
Constructor(const GlobalObject& aGlobal, const RequestOrUSVString& aInput,
const RequestInit& aInit, ErrorResult& rv);
nsIGlobalObject* GetParentObject() const

View File

@ -56,14 +56,14 @@ Response::Redirect(const GlobalObject& aGlobal, const nsAString& aUrl,
{
ErrorResult result;
ResponseInit init;
Optional<ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams> body;
Optional<ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams> body;
nsRefPtr<Response> r = Response::Constructor(aGlobal, body, init, result);
return r.forget();
}
/*static*/ already_AddRefed<Response>
Response::Constructor(const GlobalObject& aGlobal,
const Optional<ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams>& aBody,
const Optional<ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams>& aBody,
const ResponseInit& aInit, ErrorResult& aRv)
{
if (aInit.mStatus < 200 || aInit.mStatus > 599) {

View File

@ -19,7 +19,7 @@ class nsPIDOMWindow;
namespace mozilla {
namespace dom {
class ArrayBufferOrArrayBufferViewOrScalarValueStringOrURLSearchParams;
class ArrayBufferOrArrayBufferViewOrUSVStringOrURLSearchParams;
class Headers;
class InternalHeaders;
class Promise;
@ -87,7 +87,7 @@ public:
static already_AddRefed<Response>
Constructor(const GlobalObject& aGlobal,
const Optional<ArrayBufferOrArrayBufferViewOrBlobOrScalarValueStringOrURLSearchParams>& aBody,
const Optional<ArrayBufferOrArrayBufferViewOrBlobOrUSVStringOrURLSearchParams>& aBody,
const ResponseInit& aInit, ErrorResult& rv);
nsIGlobalObject* GetParentObject() const

View File

@ -9,8 +9,8 @@
typedef object JSON;
// FIXME(nsm): Bug 739173: FormData is not available in workers.
// typedef (ArrayBuffer or ArrayBufferView or Blob or FormData or ScalarValueString or URLSearchParams) BodyInit;
typedef (ArrayBuffer or ArrayBufferView or Blob or ScalarValueString or URLSearchParams) BodyInit;
// typedef (ArrayBuffer or ArrayBufferView or Blob or FormData or USVString or URLSearchParams) BodyInit;
typedef (ArrayBuffer or ArrayBufferView or Blob or USVString or URLSearchParams) BodyInit;
[NoInterfaceObject, Exposed=(Window,Worker)]
interface Body {
@ -24,7 +24,7 @@ interface Body {
[Throws]
Promise<JSON> json();
[Throws]
Promise<ScalarValueString> text();
Promise<USVString> text();
};
[NoInterfaceObject, Exposed=(Window,Worker)]

View File

@ -7,12 +7,12 @@
interface nsIFile;
[Constructor(sequence<(ArrayBuffer or ArrayBufferView or Blob or DOMString)> fileBits,
ScalarValueString fileName, optional FilePropertyBag options),
USVString fileName, optional FilePropertyBag options),
// These constructors are just for chrome callers:
Constructor(Blob fileBits, optional ChromeFilePropertyBag options),
Constructor(nsIFile fileBits, optional ChromeFilePropertyBag options),
Constructor(ScalarValueString fileBits, optional ChromeFilePropertyBag options),
Constructor(USVString fileBits, optional ChromeFilePropertyBag options),
Exposed=(Window,Worker)]
interface File : Blob {

View File

@ -7,14 +7,14 @@
* https://fetch.spec.whatwg.org/#request-class
*/
typedef (Request or ScalarValueString) RequestInfo;
typedef (Request or USVString) RequestInfo;
[Constructor(RequestInfo input, optional RequestInit init),
Exposed=(Window,Worker),
Func="mozilla::dom::Headers::PrefEnabled"]
interface Request {
readonly attribute ByteString method;
readonly attribute ScalarValueString url;
readonly attribute USVString url;
readonly attribute Headers headers;
readonly attribute DOMString referrer;

View File

@ -12,11 +12,11 @@
Func="mozilla::dom::Headers::PrefEnabled"]
interface Response {
static Response error();
static Response redirect(ScalarValueString url, optional unsigned short status = 302);
static Response redirect(USVString url, optional unsigned short status = 302);
readonly attribute ResponseType type;
readonly attribute ScalarValueString url;
readonly attribute USVString url;
readonly attribute unsigned short status;
readonly attribute ByteString statusText;
readonly attribute Headers headers;

View File

@ -20,11 +20,11 @@ interface ServiceWorkerContainer : EventTarget {
readonly attribute Promise<ServiceWorkerRegistration> ready;
[Throws]
Promise<ServiceWorkerRegistration> register(ScalarValueString scriptURL,
Promise<ServiceWorkerRegistration> register(USVString scriptURL,
optional RegistrationOptionList options);
[Throws]
Promise<ServiceWorkerRegistration> getRegistration(optional ScalarValueString documentURL = "");
Promise<ServiceWorkerRegistration> getRegistration(optional USVString documentURL = "");
[Throws]
Promise<sequence<ServiceWorkerRegistration>> getRegistrations();
@ -47,5 +47,5 @@ partial interface ServiceWorkerContainer {
};
dictionary RegistrationOptionList {
ScalarValueString scope = "/";
USVString scope = "/";
};

View File

@ -15,7 +15,7 @@ interface ServiceWorkerRegistration : EventTarget {
[Unforgeable] readonly attribute ServiceWorker? waiting;
[Unforgeable] readonly attribute ServiceWorker? active;
readonly attribute ScalarValueString scope;
readonly attribute USVString scope;
[Throws]
Promise<boolean> unregister();

View File

@ -31,7 +31,7 @@ interface TestInterfaceJS {
// For testing bug 968335.
DOMString getCallerPrincipal();
DOMString convertSVS(ScalarValueString svs);
DOMString convertSVS(USVString svs);
(TestInterfaceJS or long) pingPongUnion((TestInterfaceJS or long) something);
(DOMString or TestInterfaceJS?) pingPongUnionContainingNull((TestInterfaceJS? or DOMString) something);

View File

@ -13,16 +13,16 @@
* http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
*/
[Constructor(optional ScalarValueString init = ""),
[Constructor(optional USVString init = ""),
Constructor(URLSearchParams init),
Exposed=(Window,Worker)]
interface URLSearchParams {
void append(ScalarValueString name, ScalarValueString value);
void delete(ScalarValueString name);
ScalarValueString? get(ScalarValueString name);
sequence<ScalarValueString> getAll(ScalarValueString name);
boolean has(ScalarValueString name);
void set(ScalarValueString name, ScalarValueString value);
// iterable<ScalarValueString, ScalarValueString>; - Bug 1085284
void append(USVString name, USVString value);
void delete(USVString name);
USVString? get(USVString name);
sequence<USVString> getAll(USVString name);
boolean has(USVString name);
void set(USVString name, USVString value);
// iterable<USVString, USVString>; - Bug 1085284
stringifier;
};

View File

@ -17,31 +17,31 @@
Exposed=(Window, Worker)]
interface URLUtils {
// Bug 824857: no support for stringifier attributes yet.
// stringifier attribute ScalarValueString href;
// stringifier attribute USVString href;
[Throws, CrossOriginWritable=Location]
attribute ScalarValueString href;
attribute USVString href;
[Throws]
readonly attribute ScalarValueString origin;
readonly attribute USVString origin;
[Throws]
attribute ScalarValueString protocol;
attribute USVString protocol;
[Throws]
attribute ScalarValueString username;
attribute USVString username;
[Throws]
attribute ScalarValueString password;
attribute USVString password;
[Throws]
attribute ScalarValueString host;
attribute USVString host;
[Throws]
attribute ScalarValueString hostname;
attribute USVString hostname;
[Throws]
attribute ScalarValueString port;
attribute USVString port;
[Throws]
attribute ScalarValueString pathname;
attribute USVString pathname;
[Throws]
attribute ScalarValueString search;
attribute USVString search;
[Throws]
attribute ScalarValueString hash;
attribute USVString hash;
// Bug 824857 should remove this.
[Throws]

View File

@ -17,14 +17,14 @@
Exposed=(Window, Worker)]
interface URLUtilsReadOnly {
stringifier;
readonly attribute ScalarValueString href;
readonly attribute USVString href;
readonly attribute ScalarValueString protocol;
readonly attribute ScalarValueString host;
readonly attribute ScalarValueString hostname;
readonly attribute ScalarValueString port;
readonly attribute ScalarValueString pathname;
readonly attribute ScalarValueString search;
readonly attribute ScalarValueString hash;
readonly attribute ScalarValueString origin;
readonly attribute USVString protocol;
readonly attribute USVString host;
readonly attribute USVString hostname;
readonly attribute USVString port;
readonly attribute USVString pathname;
readonly attribute USVString search;
readonly attribute USVString hash;
readonly attribute USVString origin;
};

View File

@ -304,7 +304,7 @@ WorkerGlobalScope::GetPerformance()
}
already_AddRefed<Promise>
WorkerGlobalScope::Fetch(const RequestOrScalarValueString& aInput,
WorkerGlobalScope::Fetch(const RequestOrUSVString& aInput,
const RequestInit& aInit, ErrorResult& aRv)
{
return FetchRequest(this, aInput, aInit, aRv);

View File

@ -17,7 +17,7 @@ namespace dom {
class Console;
class Function;
class Promise;
class RequestOrScalarValueString;
class RequestOrUSVString;
} // namespace dom
} // namespace mozilla
@ -126,7 +126,7 @@ public:
Performance* GetPerformance();
already_AddRefed<Promise>
Fetch(const RequestOrScalarValueString& aInput, const RequestInit& aInit, ErrorResult& aRv);
Fetch(const RequestOrUSVString& aInput, const RequestInit& aInit, ErrorResult& aRv);
};
class DedicatedWorkerGlobalScope MOZ_FINAL : public WorkerGlobalScope

View File

@ -1,9 +1,9 @@
[interfaces.html]
type: testharness
[URL interface: operation domainToASCII(ScalarValueString)]
[URL interface: operation domainToASCII(USVString)]
expected: FAIL
[URL interface: operation domainToUnicode(ScalarValueString)]
[URL interface: operation domainToUnicode(USVString)]
expected: FAIL
[URLSearchParams interface: existence and properties of interface object]

View File

@ -21,7 +21,7 @@ interface ServiceWorkerGlobalScope : WorkerGlobalScope {
readonly attribute ServiceWorkerClients clients;
[Unforgeable] readonly attribute DOMString scope;
Promise<any> fetch((Request or ScalarValueString) request);
Promise<any> fetch((Request or USVString) request);
void update();
void unregister();
@ -55,7 +55,7 @@ synchronous requests MUST NOT be initiated inside of a Service Worker.
interface CacheStorage {};
interface ServiceWorkerClients {};
interface Request {};
interface ScalarValueString {};
interface USVString {};
interface EventHandler {};
interface WorkerGlobalScope {};
</pre>

View File

@ -15,11 +15,11 @@
<script type=text/plain id="idl_0">
[Constructor]
interface Cache {
Promise<AbstractResponse> match((Request or ScalarValueString) request, optional QueryParams params);
Promise<sequence<AbstractResponse>> matchAll((Request or ScalarValueString) request, optional QueryParams params);
Promise<any> add((Request or ScalarValueString)... requests);
Promise<any> put((Request or ScalarValueString) request, AbstractResponse response);
Promise<any> delete((Request or ScalarValueString) request, optional QueryParams params);
Promise<AbstractResponse> match((Request or USVString) request, optional QueryParams params);
Promise<sequence<AbstractResponse>> matchAll((Request or USVString) request, optional QueryParams params);
Promise<any> add((Request or USVString)... requests);
Promise<any> put((Request or USVString) request, AbstractResponse response);
Promise<any> delete((Request or USVString) request, optional QueryParams params);
Promise<any> each(CacheIterationCallback callback, optional object thisArg);
};
@ -30,7 +30,7 @@ dictionary QueryParams {
boolean prefixMatch;
};
callback CacheIterationCallback = void (AbstractResponse value, (Request or ScalarValueString) key, Cache map);
callback CacheIterationCallback = void (AbstractResponse value, (Request or USVString) key, Cache map);
</pre>
@ -38,7 +38,7 @@ callback CacheIterationCallback = void (AbstractResponse value, (Request or Scal
<script type=text/plain id="untested_idls">
interface AbstractResponse {};
interface Request {};
interface ScalarValueString {};
interface USVString {};
</pre>
<script>

View File

@ -15,7 +15,7 @@
<script type=text/plain id="idl_0">
[Constructor(sequence<any> iterable)]
interface CacheStorage {
Promise<any> match(ScalarValueString url, optional DOMString cacheName);
Promise<any> match(USVString url, optional DOMString cacheName);
Promise<Cache> get(DOMString key);
Promise<boolean> has(DOMString key);
Promise<any> set(DOMString key, Cache val);
@ -42,7 +42,7 @@ convenience methods.
<script type=text/plain id="untested_idls">
interface ScalarValueString {};
interface USVString {};
interface Cache {};
</pre>

View File

@ -21,7 +21,7 @@ interface FetchEvent : Event {
readonly attribute boolean isReload;
void respondWith(Promise<AbstractResponse> r);
Promise<any> forwardTo(ScalarValueString url);
Promise<any> forwardTo(USVString url);
Promise<any> default();
};
@ -51,7 +51,7 @@ Service Workers use the `[FetchEvent][1]` interface for `[fetch][2]` event.
interface Request {};
interface Client {};
interface AbstractResponse {};
interface ScalarValueString {};
interface USVString {};
interface Event {};
</pre>

View File

@ -12,26 +12,26 @@
[Constructor(DOMString url, optional DOMString base = "about:blank"),
Exposed=Window,Worker]
interface URL {
static DOMString domainToASCII(ScalarValueString domain);
static DOMString domainToUnicode(ScalarValueString domain);
static DOMString domainToASCII(USVString domain);
static DOMString domainToUnicode(USVString domain);
};
URL implements URLUtils;
[NoInterfaceObject]
interface URLUtils {
stringifier attribute ScalarValueString href;
stringifier attribute USVString href;
readonly attribute DOMString origin;
attribute ScalarValueString protocol;
attribute ScalarValueString username;
attribute ScalarValueString password;
attribute ScalarValueString host;
attribute ScalarValueString hostname;
attribute ScalarValueString port;
attribute ScalarValueString pathname;
attribute ScalarValueString search;
attribute USVString protocol;
attribute USVString username;
attribute USVString password;
attribute USVString host;
attribute USVString hostname;
attribute USVString port;
attribute USVString pathname;
attribute USVString search;
attribute URLSearchParams searchParams;
attribute ScalarValueString hash;
attribute USVString hash;
};
[NoInterfaceObject]
@ -48,15 +48,15 @@ interface URLUtilsReadOnly {
readonly attribute DOMString hash;
};
interface URLSearchParams {
void append(ScalarValueString name, ScalarValueString value);
void delete(ScalarValueString name);
DOMString? get(ScalarValueString name);
sequence<DOMString> getAll(ScalarValueString name);
boolean has(ScalarValueString name);
void set(ScalarValueString name, ScalarValueString value);
void append(USVString name, USVString value);
void delete(USVString name);
DOMString? get(USVString name);
sequence<DOMString> getAll(USVString name);
boolean has(USVString name);
void set(USVString name, USVString value);
stringifier;
};
typedef DOMString ScalarValueString;
typedef DOMString USVString;
</script>
<script>
"use strict";