summaryrefslogtreecommitdiffstats
path: root/dom/ipc
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-06 16:03:39 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:31:16 +0200
commit8c41fcd24048154e3526e506157d337a2ab434e8 (patch)
treecadcee4433f470969e8e14591f6d7d89c1c9f39b /dom/ipc
parent27f4e60be80610b4be361f51257a5501852ed795 (diff)
downloadUXP-8c41fcd24048154e3526e506157d337a2ab434e8.tar
UXP-8c41fcd24048154e3526e506157d337a2ab434e8.tar.gz
UXP-8c41fcd24048154e3526e506157d337a2ab434e8.tar.lz
UXP-8c41fcd24048154e3526e506157d337a2ab434e8.tar.xz
UXP-8c41fcd24048154e3526e506157d337a2ab434e8.zip
Issue #1390 - Get rid of the Presentation API
Diffstat (limited to 'dom/ipc')
-rw-r--r--dom/ipc/ContentChild.cpp45
-rw-r--r--dom/ipc/ContentChild.h11
-rw-r--r--dom/ipc/ContentParent.cpp23
-rw-r--r--dom/ipc/ContentParent.h6
-rw-r--r--dom/ipc/PContent.ipdl16
5 files changed, 0 insertions, 101 deletions
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index fdf0fcf3e..41856eef8 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -150,8 +150,6 @@
#endif
#include "mozilla/dom/File.h"
-#include "mozilla/dom/PPresentationChild.h"
-#include "mozilla/dom/PresentationIPCService.h"
#include "mozilla/ipc/InputStreamUtils.h"
#ifdef MOZ_WEBSPEECH
@@ -1417,20 +1415,6 @@ ContentChild::SendPBlobConstructor(PBlobChild* aActor,
return PContentChild::SendPBlobConstructor(aActor, aParams);
}
-PPresentationChild*
-ContentChild::AllocPPresentationChild()
-{
- MOZ_CRASH("We should never be manually allocating PPresentationChild actors");
- return nullptr;
-}
-
-bool
-ContentChild::DeallocPPresentationChild(PPresentationChild* aActor)
-{
- delete aActor;
- return true;
-}
-
PFlyWebPublishedServerChild*
ContentChild::AllocPFlyWebPublishedServerChild(const nsString& name,
const FlyWebPublishOptions& params)
@@ -1448,35 +1432,6 @@ ContentChild::DeallocPFlyWebPublishedServerChild(PFlyWebPublishedServerChild* aA
}
bool
-ContentChild::RecvNotifyPresentationReceiverLaunched(PBrowserChild* aIframe,
- const nsString& aSessionId)
-{
- nsCOMPtr<nsIDocShell> docShell =
- do_GetInterface(static_cast<TabChild*>(aIframe)->WebNavigation());
- NS_WARNING_ASSERTION(docShell, "WebNavigation failed");
-
- nsCOMPtr<nsIPresentationService> service =
- do_GetService(PRESENTATION_SERVICE_CONTRACTID);
- NS_WARNING_ASSERTION(service, "presentation service is missing");
-
- Unused << NS_WARN_IF(NS_FAILED(static_cast<PresentationIPCService*>(service.get())->MonitorResponderLoading(aSessionId, docShell)));
-
- return true;
-}
-
-bool
-ContentChild::RecvNotifyPresentationReceiverCleanUp(const nsString& aSessionId)
-{
- nsCOMPtr<nsIPresentationService> service =
- do_GetService(PRESENTATION_SERVICE_CONTRACTID);
- NS_WARNING_ASSERTION(service, "presentation service is missing");
-
- Unused << NS_WARN_IF(NS_FAILED(service->UntrackSessionInfo(aSessionId, nsIPresentationService::ROLE_RECEIVER)));
-
- return true;
-}
-
-bool
ContentChild::RecvNotifyEmptyHTTPCache()
{
MOZ_ASSERT(NS_IsMainThread());
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index 4c8f15cc0..403328a21 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -297,23 +297,12 @@ public:
virtual bool DeallocPStorageChild(PStorageChild* aActor) override;
- virtual PPresentationChild* AllocPPresentationChild() override;
-
- virtual bool DeallocPPresentationChild(PPresentationChild* aActor) override;
-
virtual PFlyWebPublishedServerChild*
AllocPFlyWebPublishedServerChild(const nsString& name,
const FlyWebPublishOptions& params) override;
virtual bool DeallocPFlyWebPublishedServerChild(PFlyWebPublishedServerChild* aActor) override;
- virtual bool
- RecvNotifyPresentationReceiverLaunched(PBrowserChild* aIframe,
- const nsString& aSessionId) override;
-
- virtual bool
- RecvNotifyPresentationReceiverCleanUp(const nsString& aSessionId) override;
-
virtual bool RecvNotifyEmptyHTTPCache() override;
virtual PSpeechSynthesisChild* AllocPSpeechSynthesisChild() override;
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 97e3a4880..026346b77 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -51,8 +51,6 @@
#include "mozilla/dom/ServiceWorkerRegistrar.h"
#include "mozilla/dom/power/PowerManagerService.h"
#include "mozilla/dom/Permissions.h"
-#include "mozilla/dom/PresentationParent.h"
-#include "mozilla/dom/PPresentationParent.h"
#include "mozilla/dom/PushNotifier.h"
#include "mozilla/dom/FlyWebPublishedServerIPC.h"
#include "mozilla/dom/quota/QuotaManagerService.h"
@@ -3106,27 +3104,6 @@ ContentParent::DeallocPStorageParent(PStorageParent* aActor)
return true;
}
-PPresentationParent*
-ContentParent::AllocPPresentationParent()
-{
- RefPtr<PresentationParent> actor = new PresentationParent();
- return actor.forget().take();
-}
-
-bool
-ContentParent::DeallocPPresentationParent(PPresentationParent* aActor)
-{
- RefPtr<PresentationParent> actor =
- dont_AddRef(static_cast<PresentationParent*>(aActor));
- return true;
-}
-
-bool
-ContentParent::RecvPPresentationConstructor(PPresentationParent* aActor)
-{
- return static_cast<PresentationParent*>(aActor)->Init(mChildID);
-}
-
PFlyWebPublishedServerParent*
ContentParent::AllocPFlyWebPublishedServerParent(const nsString& name,
const FlyWebPublishOptions& params)
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 26b5c44ac..a4ddb9c64 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -800,12 +800,6 @@ private:
virtual bool DeallocPStorageParent(PStorageParent* aActor) override;
- virtual PPresentationParent* AllocPPresentationParent() override;
-
- virtual bool DeallocPPresentationParent(PPresentationParent* aActor) override;
-
- virtual bool RecvPPresentationConstructor(PPresentationParent* aActor) override;
-
virtual PFlyWebPublishedServerParent*
AllocPFlyWebPublishedServerParent(const nsString& name,
const FlyWebPublishOptions& params) override;
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index e8fb25aec..9ed8363d7 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -43,7 +43,6 @@ include protocol PJavaScript;
include protocol PRemoteSpellcheckEngine;
include protocol PWebBrowserPersistDocument;
include protocol PWebrtcGlobal;
-include protocol PPresentation;
include protocol PVideoDecoderManager;
include protocol PFlyWebPublishedServer;
include DOMTypes;
@@ -260,7 +259,6 @@ nested(upto inside_cpow) sync protocol PContent
manages PRemoteSpellcheckEngine;
manages PWebBrowserPersistDocument;
manages PWebrtcGlobal;
- manages PPresentation;
manages PFlyWebPublishedServer;
both:
@@ -481,18 +479,6 @@ child:
async UpdateWindow(uintptr_t aChildId);
/**
- * Notify the child that presentation receiver has been launched with the
- * correspondent iframe.
- */
- async NotifyPresentationReceiverLaunched(PBrowser aIframe, nsString aSessionId);
-
- /**
- * Notify the child that the info about a presentation receiver needs to be
- * cleaned up.
- */
- async NotifyPresentationReceiverCleanUp(nsString aSessionId);
-
- /**
* Notify the child that cache is emptied.
*/
async NotifyEmptyHTTPCache();
@@ -682,8 +668,6 @@ parent:
async PWebrtcGlobal();
- async PPresentation();
-
async PFlyWebPublishedServer(nsString name, FlyWebPublishOptions params);
// Services remoting