summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2022-07-30 07:21:46 +0000
committerMoonchild <moonchild@palemoon.org>2022-07-30 07:21:46 +0000
commita46ea601f7bb1f29d3856f607573be019876b45b (patch)
treefb3d74cd51928dd9c22a3f38669488d4f1a07ac3
parent32c8246e1615dcf1dbcf775141ee044def649ae7 (diff)
parentfad8235ad2a02f3cd1cd50ec677377990642b47b (diff)
downloaduxp-a46ea601f7bb1f29d3856f607573be019876b45b.tar.gz
Merge pull request 'Fix build bustage for applications where WebRTC building is enabled.' (#1981) from jobbautista9/UXP:1980-rtcfix into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1981
-rw-r--r--dom/bindings/parser/WebIDL.py10
-rw-r--r--dom/webidl/RTCPeerConnection.webidl1
-rw-r--r--xpcom/base/CycleCollectedJSContext.h2
3 files changed, 9 insertions, 4 deletions
diff --git a/dom/bindings/parser/WebIDL.py b/dom/bindings/parser/WebIDL.py
index ce8862c02b..59db43f6bd 100644
--- a/dom/bindings/parser/WebIDL.py
+++ b/dom/bindings/parser/WebIDL.py
@@ -248,8 +248,14 @@ class IDLScope(IDLObject):
return self.QName()
def QName(self):
- if self._name:
- return self._name.QName() + "::"
+ # It's possible for us to be called before __init__ has been called, for
+ # the IDLObjectWithScope case. In that case, self._name won't be set yet.
+ if hasattr(self, "_name"):
+ name = self._name
+ else:
+ name = None
+ if name:
+ return name.QName() + "::"
return "::"
def ensureUnique(self, identifier, object):
diff --git a/dom/webidl/RTCPeerConnection.webidl b/dom/webidl/RTCPeerConnection.webidl
index 510957056f..6fb4194c36 100644
--- a/dom/webidl/RTCPeerConnection.webidl
+++ b/dom/webidl/RTCPeerConnection.webidl
@@ -9,7 +9,6 @@
callback RTCSessionDescriptionCallback = void (RTCSessionDescription sdp);
callback RTCPeerConnectionErrorCallback = void (DOMError error);
-callback VoidFunction = void ();
callback RTCStatsCallback = void (RTCStatsReport report);
enum RTCSignalingState {
diff --git a/xpcom/base/CycleCollectedJSContext.h b/xpcom/base/CycleCollectedJSContext.h
index 914bb95d30..366a1ea3bb 100644
--- a/xpcom/base/CycleCollectedJSContext.h
+++ b/xpcom/base/CycleCollectedJSContext.h
@@ -142,7 +142,7 @@ public:
virtual void Run(AutoSlowOperation& aAso) = 0;
virtual bool Suppressed() { return false; }
protected:
- virtual ~MicroTaskRunnable() {}
+ virtual ~MicroTaskRunnable() = default;
};
class CycleCollectedJSContext