KotJohansson/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:30:27 +00:00
Code Issues Projects Releases Wiki Activity

import changes from rmottola/Arctic-Fox:

Browse Source 
- Goanna->Gecko:  GoannaMediaPluginService & GoannaTouchDispatcher (1e10799bf)
- Goanna->Gecko:  GoannaProcess (dd671240a)
- Goanna->Gecko: goannamediaplugin (2a9423ba6)
- Goanna->Gecko: GoannaContentController (62e7c2f5f)
- Goanna->Gecko: GoannaProfiler & GoannaTaskTracer (376c45a3c)
This commit is contained in:
Roy Tam
2020-01-11 09:59:56 +08:00
parent fa517dfc68
commit 3e6694dfa6
341 changed files with 971 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docshell/base/nsDocShell.cpp
+7 -7
View File
@@ -88,7 +88,7 @@
#include "nsDocShellEnumerator.h"
#include "nsSHistory.h"
#include "nsDocShellEditorData.h"
#include "GoannaProfiler.h"
#include "GeckoProfiler.h"
// Helper Classes
#include "nsError.h"
@@ -817,7 +817,7 @@ IncreasePrivateDocShellCount()
{
gNumberOfPrivateDocShells++;
if (gNumberOfPrivateDocShells > 1 ||
XRE_GetProcessType() != GoannaProcessType_Content) {
XRE_GetProcessType() != GeckoProcessType_Content) {
return;
}
@@ -831,7 +831,7 @@ DecreasePrivateDocShellCount()
MOZ_ASSERT(gNumberOfPrivateDocShells > 0);
gNumberOfPrivateDocShells--;
if (!gNumberOfPrivateDocShells) {
if (XRE_GetProcessType() == GoannaProcessType_Content) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
dom::ContentChild* cc = dom::ContentChild::GetSingleton();
cc->SendPrivateDocShellsExist(false);
return;
@@ -5053,7 +5053,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
mInPrivateBrowsing ? nsISocketProvider::NO_PERMANENT_STORAGE : 0;
bool isStsHost = false;
bool isPinnedHost = false;
if (XRE_GetProcessType() == GoannaProcessType_Default) {
if (XRE_GetProcessType() == GeckoProcessType_Default) {
nsCOMPtr<nsISiteSecurityService> sss =
do_GetService(NS_SSSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
@@ -7513,7 +7513,7 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
nsCOMPtr<nsIApplicationCacheChannel> appCacheChannel =
do_QueryInterface(aNewChannel);
if (appCacheChannel) {
if (GoannaProcessType_Default != XRE_GetProcessType()) {
if (GeckoProcessType_Default != XRE_GetProcessType()) {
// Permission will be checked in the parent process.
appCacheChannel->SetChooseApplicationCache(true);
} else {
@@ -10779,7 +10779,7 @@ nsDocShell::DoURILoad(nsIURI* aURI,
// Loads with the correct permissions should check for a matching
// application cache.
if (GoannaProcessType_Default != XRE_GetProcessType()) {
if (GeckoProcessType_Default != XRE_GetProcessType()) {
// Permission will be checked in the parent process
appCacheChannel->SetChooseApplicationCache(true);
} else {
@@ -14159,7 +14159,7 @@ nsDocShell::MaybeNotifyKeywordSearchLoading(const nsString& aProvider,
return;
}
if (XRE_GetProcessType() == GoannaProcessType_Content) {
if (XRE_GetProcessType() == GeckoProcessType_Content) {
dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
if (contentChild) {
contentChild->SendNotifyKeywordSearchLoading(aProvider, aKeyword);