зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1457092 - Content sandbox codepaths are Linux only. r=gcp
--HG-- extra : rebase_source : e8c79bc0dfb1b8f03d2ceec98835f9f6ac7a4612
This commit is contained in:
Родитель
aa545e34c8
Коммит
984eaf80dd
|
@ -1543,7 +1543,7 @@ gfxFcPlatformFontList::AddFontSetFamilies(FcFontSet* aFontSet,
|
|||
continue;
|
||||
}
|
||||
|
||||
#ifdef MOZ_CONTENT_SANDBOX
|
||||
#if defined(MOZ_CONTENT_SANDBOX) && defined (XP_LINUX)
|
||||
// Skip any fonts that will be blocked by the content-process sandbox
|
||||
// policy.
|
||||
if (aPolicy && !(aPolicy->Lookup(reinterpret_cast<const char*>(path)) &
|
||||
|
@ -1705,7 +1705,7 @@ gfxFcPlatformFontList::InitFontListForPlatform()
|
|||
|
||||
UniquePtr<SandboxPolicy> policy;
|
||||
|
||||
#ifdef MOZ_CONTENT_SANDBOX
|
||||
#if defined(MOZ_CONTENT_SANDBOX) && defined (XP_LINUX)
|
||||
// If read sandboxing is enabled, create a temporary SandboxPolicy to
|
||||
// check font paths; use a fake PID to avoid picking up any PID-specific
|
||||
// rules by accident.
|
||||
|
|
|
@ -340,7 +340,7 @@ public:
|
|||
protected:
|
||||
virtual ~gfxFcPlatformFontList();
|
||||
|
||||
#ifdef MOZ_CONTENT_SANDBOX
|
||||
#if defined(MOZ_CONTENT_SANDBOX) && defined(XP_LINUX)
|
||||
typedef mozilla::SandboxBroker::Policy SandboxPolicy;
|
||||
#else
|
||||
// Dummy type just so we can still have a SandboxPolicy* parameter.
|
||||
|
|
Загрузка…
Ссылка в новой задаче