Adding upstream version 127.0.upstream/127.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 4 insertions, 10 deletions

diff --git a/dom/network/ConnectionWorker.cpp b/dom/network/ConnectionWorker.cpp
index e0773455df..8d283ccc73 100644
--- a/dom/network/ConnectionWorker.cpp
+++ b/dom/network/ConnectionWorker.cpp
@@ -109,7 +109,7 @@ class ShutdownRunnable : public WorkerMainThreadRunnable {
   }
 };
 
-class NotifyRunnable final : public WorkerRunnable {
+class NotifyRunnable final : public WorkerThreadRunnable {
  private:
   RefPtr<ConnectionProxy> mProxy;
 
@@ -120,7 +120,7 @@ class NotifyRunnable final : public WorkerRunnable {
  public:
   NotifyRunnable(WorkerPrivate* aWorkerPrivate, ConnectionProxy* aProxy,
                  ConnectionType aType, bool aIsWifi, uint32_t aDHCPGateway)
-      : WorkerRunnable(aWorkerPrivate, "NotifyRunnable"),
+      : WorkerThreadRunnable("NotifyRunnable"),
         mProxy(aProxy),
         mConnectionType(aType),
         mIsWifi(aIsWifi),
@@ -183,7 +183,7 @@ void ConnectionProxy::Notify(const hal::NetworkInformation& aNetworkInfo) {
       new NotifyRunnable(mWorkerRef->Private(), this,
                          static_cast<ConnectionType>(aNetworkInfo.type()),
                          aNetworkInfo.isWifi(), aNetworkInfo.dhcpGateway());
-  runnable->Dispatch();
+  runnable->Dispatch(mWorkerRef->Private());
 }
 
 void ConnectionProxy::Shutdown() {
diff --git a/dom/network/interfaces/nsITCPSocketCallback.idl b/dom/network/interfaces/nsITCPSocketCallback.idl
index 4a2b7a9ef2..181b84abeb 100644
--- a/dom/network/interfaces/nsITCPSocketCallback.idl
+++ b/dom/network/interfaces/nsITCPSocketCallback.idl
@@ -11,12 +11,6 @@
 
 #include "domstubs.idl"
 
-%{C++
-#include "nsTArrayForwardDeclare.h"
-%}
-[ref] native nsUint8TArrayRef(nsTArray<uint8_t>);
-[ptr] native JSContextPtr(JSContext);
-
 
 /*
  * This interface is implemented in TCPSocket.cpp as an internal interface
@@ -36,7 +30,7 @@ interface nsITCPSocketCallback : nsISupports {
   void fireDataStringEvent(in AString type, in ACString data);
 
   // Dispatch a "data" event at this object with an Array
-  void fireDataArrayEvent(in AString type, [const] in nsUint8TArrayRef data);
+  void fireDataArrayEvent(in AString type, in Array<uint8_t> data);
 
   // Dispatch an event of the given type at this object.
   void fireEvent(in AString type);