Remove all our local patches to the WebIDL parser

All the tweaks we need can just be made through Configuration.py, and
[Abstract] is being submitted upstream by Ms2ger.

4 files changed, 40 insertions, 83 deletions

diff --git a/components/script/dom/bindings/codegen/parser/WebIDL.py b/components/script/dom/bindings/codegen/parser/WebIDL.py
index 90ec9e88921..f210d2c6028 100644
--- a/components/script/dom/bindings/codegen/parser/WebIDL.py
+++ b/components/script/dom/bindings/codegen/parser/WebIDL.py
@@ -526,8 +526,46 @@ class IDLExposureMixins():
 
 class IDLExternalInterface(IDLObjectWithIdentifier, IDLExposureMixins):
     def __init__(self, location, parentScope, identifier):
-        raise WebIDLError("Servo does not support external interfaces.",
-                          [self.location])
+        assert isinstance(identifier, IDLUnresolvedIdentifier)
+        assert isinstance(parentScope, IDLScope)
+        self.parent = None
+        IDLObjectWithIdentifier.__init__(self, location, parentScope, identifier)
+        IDLExposureMixins.__init__(self, location)
+        IDLObjectWithIdentifier.resolve(self, parentScope)
+
+    def finish(self, scope):
+        IDLExposureMixins.finish(self, scope)
+        pass
+
+    def validate(self):
+        pass
+
+    def isExternal(self):
+        return True
+
+    def isInterface(self):
+        return True
+
+    def isConsequential(self):
+        return False
+
+    def addExtendedAttributes(self, attrs):
+        assert len(attrs) == 0
+
+    def resolve(self, parentScope):
+        pass
+
+    def getJSImplementation(self):
+        return None
+
+    def isJSImplemented(self):
+        return False
+
+    def getNavigatorProperty(self):
+        return None
+
+    def _getDependentObjects(self):
+        return set()
 
 
 class IDLPartialInterface(IDLObject):
@@ -1643,9 +1681,6 @@ class IDLDictionary(IDLObjectWithScope):
                                   self.identifier.name,
                                   [member.location] + locations)
 
-    def module(self):
-        return self.location.filename().split('/')[-1].split('.webidl')[0] + 'Binding'
-
     def addExtendedAttributes(self, attrs):
         assert len(attrs) == 0
 
@@ -4157,9 +4192,6 @@ class IDLCallback(IDLObjectWithScope):
         self._treatNonCallableAsNull = False
         self._treatNonObjectAsNull = False
 
-    def module(self):
-        return self.location.filename().split('/')[-1].split('.webidl')[0] + 'Binding'
-
     def isCallback(self):
         return True
 
diff --git a/components/script/dom/bindings/codegen/parser/external.patch b/components/script/dom/bindings/codegen/parser/external.patch
deleted file mode 100644
index 964a6d8774a..00000000000
--- a/components/script/dom/bindings/codegen/parser/external.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- WebIDL.py
-+++ WebIDL.py
-@@ -505,46 +505,8 @@ class IDLExposureMixins():
- 
- class IDLExternalInterface(IDLObjectWithIdentifier, IDLExposureMixins):
-     def __init__(self, location, parentScope, identifier):
--        assert isinstance(identifier, IDLUnresolvedIdentifier)
--        assert isinstance(parentScope, IDLScope)
--        self.parent = None
--        IDLObjectWithIdentifier.__init__(self, location, parentScope, identifier)
--        IDLExposureMixins.__init__(self, location)
--        IDLObjectWithIdentifier.resolve(self, parentScope)
--
--    def finish(self, scope):
--        IDLExposureMixins.finish(self, scope)
--        pass
--
--    def validate(self):
--        pass
--
--    def isExternal(self):
--        return True
--
--    def isInterface(self):
--        return True
--
--    def isConsequential(self):
--        return False
--
--    def addExtendedAttributes(self, attrs):
--        assert len(attrs) == 0
--
--    def resolve(self, parentScope):
--        pass
--
--    def getJSImplementation(self):
--        return None
--
--    def isJSImplemented(self):
--        return False
--
--    def getNavigatorProperty(self):
--        return None
--
--    def _getDependentObjects(self):
--        return set()
-+        raise WebIDLError("Servo does not support external interfaces.",
-+                          [self.location])
- 
- class IDLPartialInterface(IDLObject):
-     def __init__(self, location, name, members, nonPartialInterface):
diff --git a/components/script/dom/bindings/codegen/parser/module.patch b/components/script/dom/bindings/codegen/parser/module.patch
deleted file mode 100644
index aaec7c61b7e..00000000000
--- a/components/script/dom/bindings/codegen/parser/module.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- WebIDL.py
-+++ WebIDL.py
-@@ -1506,6 +1506,9 @@ class IDLDictionary(IDLObjectWithScope):
-                                   self.identifier.name,
-                                   [member.location] + locations)
- 
-+    def module(self):
-+        return self.location.filename().split('/')[-1].split('.webidl')[0] + 'Binding'
-+
-     def addExtendedAttributes(self, attrs):
-         assert len(attrs) == 0
- 
-@@ -3574,6 +3577,9 @@ class IDLCallbackType(IDLType, IDLObjectWithScope):
-         self._treatNonCallableAsNull = False
-         self._treatNonObjectAsNull = False
- 
-+    def module(self):
-+        return self.location.filename().split('/')[-1].split('.webidl')[0] + 'Binding'
-+
-     def isCallback(self):
-         return True
- 
diff --git a/components/script/dom/bindings/codegen/parser/update.sh b/components/script/dom/bindings/codegen/parser/update.sh
index 26f70aac6ae..a60821670b3 100755
--- a/components/script/dom/bindings/codegen/parser/update.sh
+++ b/components/script/dom/bindings/codegen/parser/update.sh
@@ -1,4 +1,2 @@
 wget https://mxr.mozilla.org/mozilla-central/source/dom/bindings/parser/WebIDL.py?raw=1 -O WebIDL.py
-patch < external.patch
-patch < module.patch
 patch < abstract.patch