diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-06 16:03:39 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-06 16:03:39 -0500 |
| commit | 5483f807c2663be8c63caf8d59ee151b3ef499d3 (patch) | |
| tree | 13b912637e69511529d15676a905e7fe0ef2d169 /dom/base/Navigator.cpp | |
| parent | e80e4595b9034fb06592c083c80feb7613ff9518 (diff) | |
| download | UXP-5483f807c2663be8c63caf8d59ee151b3ef499d3.tar UXP-5483f807c2663be8c63caf8d59ee151b3ef499d3.tar.gz UXP-5483f807c2663be8c63caf8d59ee151b3ef499d3.tar.lz UXP-5483f807c2663be8c63caf8d59ee151b3ef499d3.tar.xz UXP-5483f807c2663be8c63caf8d59ee151b3ef499d3.zip | |
Issue #1390 - Get rid of the Presentation API
Diffstat (limited to 'dom/base/Navigator.cpp')
| -rw-r--r-- | dom/base/Navigator.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index fdf151b6c..1433f3257 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -40,7 +40,6 @@ #include "mozilla/dom/FlyWebPublishedServer.h" #include "mozilla/dom/FlyWebService.h" #include "mozilla/dom/Permissions.h" -#include "mozilla/dom/Presentation.h" #include "mozilla/dom/ServiceWorkerContainer.h" #include "mozilla/dom/StorageManager.h" #include "mozilla/dom/TCPSocket.h" @@ -67,8 +66,6 @@ #include "nsIAppsService.h" #include "mozIApplication.h" #include "WidgetUtils.h" -#include "nsIPresentationService.h" - #include "mozilla/dom/MediaDevices.h" #include "MediaManager.h" @@ -218,7 +215,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator) #ifdef MOZ_EME NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaKeySystemAccessManager) #endif - NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPresentation) #ifdef MOZ_GAMEPAD NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGamepadServiceTest) #endif @@ -284,10 +280,6 @@ Navigator::Invalidate() mTimeManager = nullptr; } - if (mPresentation) { - mPresentation = nullptr; - } - mServiceWorkerContainer = nullptr; #ifdef MOZ_EME @@ -1931,19 +1923,5 @@ Navigator::RequestMediaKeySystemAccess(const nsAString& aKeySystem, } #endif -Presentation* -Navigator::GetPresentation(ErrorResult& aRv) -{ - if (!mPresentation) { - if (!mWindow) { - aRv.Throw(NS_ERROR_UNEXPECTED); - return nullptr; - } - mPresentation = Presentation::Create(mWindow); - } - - return mPresentation; -} - } // namespace dom } // namespace mozilla |