Merge autoland to mozilla-central. a=merge
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
#include "mozilla/dom/SessionStorageManager.h"
|
||||
#include "mozilla/ipc/ProtocolUtils.h"
|
||||
#ifdef NS_PRINTING
|
||||
#include "mozilla/layout/RemotePrintJobParent.h"
|
||||
# include "mozilla/layout/RemotePrintJobParent.h"
|
||||
#endif
|
||||
#include "mozilla/net/DocumentLoadListener.h"
|
||||
#include "mozilla/NullPrincipal.h"
|
||||
@@ -1264,6 +1264,10 @@ void CanonicalBrowsingContext::AddFinalDiscardListener(
|
||||
mFullyDiscardedListeners.AppendElement(std::move(aListener));
|
||||
}
|
||||
|
||||
net::EarlyHintsService* CanonicalBrowsingContext::GetEarlyHintsService() {
|
||||
return &mEarlyHintsService;
|
||||
}
|
||||
|
||||
void CanonicalBrowsingContext::AdjustPrivateBrowsingCount(
|
||||
bool aPrivateBrowsing) {
|
||||
if (IsDiscarded() || !EverAttached() || IsChrome()) {
|
||||
|
||||
Reference in New Issue
Block a user