Skip to content

Commit 6eb4c94

Browse files
committed
Bug 1631581 - Part 1: Rename NoInterfaceObject to LegacyNoInterfaceObject r=edgar
Differential Revision: https://phabricator.services.mozilla.com/D111209
1 parent 1bb19a1 commit 6eb4c94

27 files changed

+101
-101
lines changed

dom/bindings/mozwebidlcodegen/test/TestEvent.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface Event {};
77
callback EventHandlerNonNull = any (Event event);
88
typedef EventHandlerNonNull? EventHandler;
99

10-
[NoInterfaceObject]
10+
[LegacyNoInterfaceObject]
1111
interface TestEvent : EventTarget {
1212
attribute EventHandler onfoo;
1313
};

dom/bindings/parser/WebIDL.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ def finish(self, scope):
10061006
if not self.hasInterfaceObject():
10071007
raise WebIDLError(
10081008
"Interface %s unexpectedly has [LegacyWindowAlias] "
1009-
"and [NoInterfaceObject] together" % self.identifier.name,
1009+
"and [LegacyNoInterfaceObject] together" % self.identifier.name,
10101010
[self.location],
10111011
)
10121012
if not self.isExposedInWindow():
@@ -1120,13 +1120,13 @@ def finish(self, scope):
11201120
)
11211121

11221122
# Interfaces which have interface objects can't inherit
1123-
# from [NoInterfaceObject] interfaces.
1123+
# from [LegacyNoInterfaceObject] interfaces.
11241124
if self.parent.getExtendedAttribute(
1125-
"NoInterfaceObject"
1126-
) and not self.getExtendedAttribute("NoInterfaceObject"):
1125+
"LegacyNoInterfaceObject"
1126+
) and not self.getExtendedAttribute("LegacyNoInterfaceObject"):
11271127
raise WebIDLError(
11281128
"Interface %s does not have "
1129-
"[NoInterfaceObject] but inherits from "
1129+
"[LegacyNoInterfaceObject] but inherits from "
11301130
"interface %s which does"
11311131
% (self.identifier.name, self.parent.identifier.name),
11321132
[self.location, self.parent.location],
@@ -1161,7 +1161,7 @@ def finish(self, scope):
11611161
if ctor is not None:
11621162
if not self.hasInterfaceObject():
11631163
raise WebIDLError(
1164-
"Can't have both a constructor and [NoInterfaceObject]",
1164+
"Can't have both a constructor and [LegacyNoInterfaceObject]",
11651165
[self.location, ctor.location],
11661166
)
11671167

@@ -1821,10 +1821,11 @@ def addExtendedAttributes(self, attrs):
18211821
"TreatNonObjectAsNull cannot be specified on interfaces",
18221822
[attr.location, self.location],
18231823
)
1824-
elif identifier == "NoInterfaceObject":
1824+
elif identifier == "LegacyNoInterfaceObject":
18251825
if not attr.noArguments():
18261826
raise WebIDLError(
1827-
"[NoInterfaceObject] must take no arguments", [attr.location]
1827+
"[LegacyNoInterfaceObject] must take no arguments",
1828+
[attr.location],
18281829
)
18291830

18301831
self._noInterfaceObject = True
@@ -8646,7 +8647,7 @@ def simpleExtendedAttr(str):
86468647
classNameOverride=classNameOverride,
86478648
)
86488649
itr_iface.addExtendedAttributes(
8649-
[simpleExtendedAttr("NoInterfaceObject")]
8650+
[simpleExtendedAttr("LegacyNoInterfaceObject")]
86508651
)
86518652
# Make sure the exposure set for the iterator interface is the
86528653
# same as the exposure set for the iterable interface, because

dom/bindings/parser/tests/test_constructor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ def checkResults(results):
537537
try:
538538
parser.parse(
539539
"""
540-
[NoInterfaceObject]
540+
[LegacyNoInterfaceObject]
541541
interface InterfaceWithoutInterfaceObject {
542542
constructor();
543543
};
@@ -549,7 +549,8 @@ def checkResults(results):
549549

550550
harness.ok(
551551
threw,
552-
"Can't have a constructor operation on a [NoInterfaceObject] " "interface",
552+
"Can't have a constructor operation on a [LegacyNoInterfaceObject] "
553+
"interface",
553554
)
554555

555556
parser = parser.reset()

dom/bindings/parser/tests/test_constructor_no_interface_object.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ def WebIDLTest(parser, harness):
33
try:
44
parser.parse(
55
"""
6-
[NoInterfaceObject]
7-
interface TestConstructorNoInterfaceObject {
6+
[LegacyNoInterfaceObject]
7+
interface TestConstructorLegacyNoInterfaceObject {
88
constructor();
99
};
1010
"""
@@ -20,21 +20,21 @@ def WebIDLTest(parser, harness):
2020

2121
parser.parse(
2222
"""
23-
[NoInterfaceObject, NamedConstructor=FooBar]
24-
interface TestNamedConstructorNoInterfaceObject {
23+
[LegacyNoInterfaceObject, NamedConstructor=FooBar]
24+
interface TestNamedConstructorLegacyNoInterfaceObject {
2525
};
2626
"""
2727
)
2828

29-
# Test HTMLConstructor and NoInterfaceObject
29+
# Test HTMLConstructor and LegacyNoInterfaceObject
3030
parser = parser.reset()
3131

3232
threw = False
3333
try:
3434
parser.parse(
3535
"""
36-
[NoInterfaceObject]
37-
interface TestHTMLConstructorNoInterfaceObject {
36+
[LegacyNoInterfaceObject]
37+
interface TestHTMLConstructorLegacyNoInterfaceObject {
3838
[HTMLConstructor] constructor();
3939
};
4040
"""

dom/bindings/parser/tests/test_extended_attributes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
def WebIDLTest(parser, harness):
55
parser.parse(
66
"""
7-
[NoInterfaceObject]
7+
[LegacyNoInterfaceObject]
88
interface TestExtendedAttr {
99
[Unforgeable] readonly attribute byte b;
1010
};

dom/bindings/parser/tests/test_securecontext_extended_attribute.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,12 +473,12 @@ def WebIDLTest(parser, harness):
473473
"Methods copied from non-[SecureContext] mixin should not be [SecureContext]",
474474
)
475475

476-
# Test SecureContext and NoInterfaceObject
476+
# Test SecureContext and LegacyNoInterfaceObject
477477
parser = parser.reset()
478478
parser.parse(
479479
"""
480-
[NoInterfaceObject, SecureContext]
481-
interface TestSecureContextNoInterfaceObject {
480+
[LegacyNoInterfaceObject, SecureContext]
481+
interface TestSecureContextLegacyNoInterfaceObject {
482482
void testSecureMethod(byte foo);
483483
};
484484
"""
@@ -487,7 +487,7 @@ def WebIDLTest(parser, harness):
487487
harness.check(
488488
len(results[0].members),
489489
1,
490-
"TestSecureContextNoInterfaceObject should have only one member",
490+
"TestSecureContextLegacyNoInterfaceObject should have only one member",
491491
)
492492
harness.ok(
493493
results[0].getExtendedAttribute("SecureContext"),

dom/bindings/test/TestCodeGen.webidl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ interface OnlyForUseInConstructor {
160160
NamedConstructor=Test4(record<DOMString, record<DOMString, any>> arg1),
161161
NamedConstructor=Test5(record<DOMString, sequence<record<DOMString, record<DOMString, sequence<sequence<any>>>>>> arg1),
162162
NamedConstructor=Test6(sequence<record<ByteString, sequence<sequence<record<ByteString, record<USVString, any>>>>>> arg1),
163-
Exposed=Window,
164-
]
163+
Exposed=Window]
165164
interface TestInterface {
166165
constructor();
167166
constructor(DOMString str);

dom/bindings/test/TestExampleGen.webidl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
object? obj2, sequence<Dict> seq, optional any any2,
1010
optional object obj3, optional object? obj4),
1111
NamedConstructor=Example2((long or record<DOMString, any>) arg1),
12-
Exposed=Window,
13-
]
12+
Exposed=Window]
1413
interface TestExampleInterface {
1514
constructor();
1615
constructor(DOMString str);

dom/bindings/test/TestJSImplGen.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ interface TestCImplementedInterface : TestJSImplInterface {
874874
interface TestCImplementedInterface2 {
875875
};
876876

877-
[NoInterfaceObject,
877+
[LegacyNoInterfaceObject,
878878
JSImplementation="@mozilla.org/test-js-impl-interface;2",
879879
Exposed=Window]
880880
interface TestJSImplNoInterfaceObject {

dom/chrome-webidl/DocumentL10n.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* are added to the document, and is removed in case all links
1717
* of that type are removed from it.
1818
*/
19-
[NoInterfaceObject,
19+
[LegacyNoInterfaceObject,
2020
Exposed=Window]
2121
interface DocumentL10n : DOMLocalization {
2222
/**

dom/chrome-webidl/JSProcessActor.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ dictionary ProcessActorChildOptions : ProcessActorSidedOptions {
7575
*
7676
* Unlike for JSWindowActor, observers are always invoked, and do not need to
7777
* pass an inner or outer window as subject.
78-
**/
78+
*/
7979
sequence<ByteString> observers;
8080
};

dom/chrome-webidl/JSWindowActor.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,6 @@ dictionary WindowActorChildOptions : WindowActorSidedOptions {
139139
* nsGlobalWindowOuter object as their subject, and the events will only be
140140
* dispatched to the corresponding window actor. If additional observer
141141
* notification's subjects are needed, please file a bug for that.
142-
**/
142+
*/
143143
sequence<ByteString> observers;
144144
};

dom/webidl/DOMException.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ interface mixin ExceptionMembers
4949
readonly attribute DOMString stack;
5050
};
5151

52-
[NoInterfaceObject, Exposed=(Window,Worker)]
52+
[LegacyNoInterfaceObject, Exposed=(Window,Worker)]
5353
interface Exception {
5454
// The name of the error code (ie, a string repr of |result|).
5555
readonly attribute DOMString name;

dom/webidl/DeviceMotionEvent.webidl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
* https://w3c.github.io/deviceorientation/
77
*/
88

9-
[NoInterfaceObject,
9+
[LegacyNoInterfaceObject,
1010
Exposed=Window]
1111
interface DeviceAcceleration {
1212
readonly attribute double? x;
1313
readonly attribute double? y;
1414
readonly attribute double? z;
1515
};
1616

17-
[NoInterfaceObject,
17+
[LegacyNoInterfaceObject,
1818
Exposed=Window]
1919
interface DeviceRotationRate {
2020
readonly attribute double? alpha;

dom/webidl/External.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* You can obtain one at http://mozilla.org/MPL/2.0/.
55
*/
66

7-
[NoInterfaceObject, JSImplementation="@mozilla.org/sidebar;1",
7+
[LegacyNoInterfaceObject, JSImplementation="@mozilla.org/sidebar;1",
88
Exposed=Window]
99
interface External
1010
{

dom/webidl/FeaturePolicy.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://w3c.github.io/webappsec-feature-policy/#idl-index
88
*/
99

10-
[NoInterfaceObject,
10+
[LegacyNoInterfaceObject,
1111
Exposed=Window]
1212
interface FeaturePolicy {
1313
boolean allowsFeature(DOMString feature, optional DOMString origin);

dom/webidl/FontFaceSet.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dictionary FontFaceSetIteratorResult
1818
};
1919

2020
// To implement FontFaceSet's iterator until we can use setlike.
21-
[NoInterfaceObject,
21+
[LegacyNoInterfaceObject,
2222
Exposed=Window]
2323
interface FontFaceSetIterator {
2424
[Throws] FontFaceSetIteratorResult next();

dom/webidl/GetUserMediaRequest.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ enum GetUserMediaRequestType {
2121
"recording-device-stopped"
2222
};
2323

24-
[NoInterfaceObject,
24+
[LegacyNoInterfaceObject,
2525
Exposed=Window]
2626
interface GetUserMediaRequest {
2727
readonly attribute GetUserMediaRequestType type;

dom/webidl/ImageCaptureErrorEvent.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dictionary ImageCaptureErrorEventInit : EventInit {
2323
ImageCaptureError? imageCaptureError = null;
2424
};
2525

26-
[NoInterfaceObject,
26+
[LegacyNoInterfaceObject,
2727
Exposed=Window]
2828
interface ImageCaptureError {
2929
const unsigned short FRAME_GRAB_ERROR = 1;

dom/webidl/IntlUtils.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dictionary LocaleInfo {
2424
/**
2525
* The IntlUtils interface provides helper functions for localization.
2626
*/
27-
[NoInterfaceObject,
27+
[LegacyNoInterfaceObject,
2828
Exposed=Window]
2929
interface IntlUtils {
3030
/**

dom/webidl/MediaStreamError.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// TODO: This is an 'exception', not an interface, by virtue of needing to be
1414
// passed as a promise rejection-reason. Revisit if DOMException grows a customArg
1515

16-
[ExceptionClass, NoInterfaceObject,
16+
[ExceptionClass, LegacyNoInterfaceObject,
1717
Exposed=Window]
1818
interface MediaStreamError {
1919
readonly attribute DOMString name;

dom/webidl/Promise.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ callback AnyCallback = any (any value);
1414

1515
// Hack to allow us to have JS owning and properly tracing/CCing/etc a
1616
// PromiseNativeHandler.
17-
[NoInterfaceObject, Exposed=(Window,Worker)]
17+
[LegacyNoInterfaceObject, Exposed=(Window,Worker)]
1818
interface PromiseNativeHandler {
1919
};

dom/webidl/RTCIdentityProvider.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* http://w3c.github.io/webrtc-pc/ (with https://github.com/w3c/webrtc-pc/pull/178)
77
*/
88

9-
[NoInterfaceObject,
9+
[LegacyNoInterfaceObject,
1010
Exposed=Window]
1111
interface RTCIdentityProviderRegistrar {
1212
void register(RTCIdentityProvider idp);

0 commit comments

Comments
 (0)