Bug 1549753 - Don't include BrowserParent.h from BrowserBridgeParent.h. r=afarre

Differential Revision: https://phabricator.services.mozilla.com/D30214

--HG--
extra : rebase_source : d646fffd4397809ff5082e5a0098427f620288d7
extra : histedit_source : fec5ebacbf77c06ed9dba9e35f54474d0cf38194
This commit is contained in:
Ryan Hunt 2019-05-07 11:07:47 -05:00
Родитель 34f9686f88
Коммит a1f98beaf1
2 изменённых файлов: 14 добавлений и 8 удалений

Просмотреть файл

@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/BrowserBridgeParent.h"
#include "mozilla/dom/BrowserParent.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/ContentProcessManager.h"
#include "mozilla/dom/CanonicalBrowsingContext.h"
@ -99,6 +100,15 @@ nsresult BrowserBridgeParent::Init(const nsString& aPresentationURL,
return NS_OK;
}
CanonicalBrowsingContext* BrowserBridgeParent::GetBrowsingContext() {
return mBrowserParent->GetBrowsingContext();
}
BrowserParent* BrowserBridgeParent::Manager() {
MOZ_ASSERT(mIPCOpen);
return static_cast<BrowserParent*>(PBrowserBridgeParent::Manager());
}
void BrowserBridgeParent::Destroy() {
if (mBrowserParent) {
mBrowserParent->Destroy();

Просмотреть файл

@ -8,11 +8,12 @@
#define mozilla_dom_BrowserBridgeParent_h
#include "mozilla/dom/PBrowserBridgeParent.h"
#include "mozilla/dom/BrowserParent.h"
namespace mozilla {
namespace dom {
class BrowserParent;
/**
* BrowserBridgeParent implements the parent actor part of the PBrowserBridge
* protocol. See PBrowserBridge for more information.
@ -30,15 +31,10 @@ class BrowserBridgeParent : public PBrowserBridgeParent {
BrowserParent* GetBrowserParent() { return mBrowserParent; }
CanonicalBrowsingContext* GetBrowsingContext() {
return mBrowserParent->GetBrowsingContext();
}
CanonicalBrowsingContext* GetBrowsingContext();
// Get our manager actor.
BrowserParent* Manager() {
MOZ_ASSERT(mIPCOpen);
return static_cast<BrowserParent*>(PBrowserBridgeParent::Manager());
}
BrowserParent* Manager();
// Tear down this BrowserBridgeParent.
void Destroy();