mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
9de1898bc2
Passes the profile dir to the content process as a -profile CLI option so that the correct profile dir can be used in the OS X content sandbox rules. Only enabled on OS X for now. On Nightly, profile directories will now be read/write protected from the content process (apart from a few profile subdirectories) even when they don't reside in ~/Library. xpcshell tests invoke the content process without providing a profile directory. In that case, we don't need to add filesystem profile dir. read/write exclusion rules to the sandbox. This patch adds two new macros to the content sandbox rule set: |profileDir| holds the path to the profile or the emptry string; |hasProfileDir| is a boolean (1 or 0) that indicates whether or not the profile directory rules should be added. If |hasProfileDir| is 0, profile directory exclusion rules don't need to be added and |profileDir| is not used. MozReview-Commit-ID: rrTcQwTNdT --HG-- extra : rebase_source : 3d5b612c8eb3a1d0da028eba277cd9d6f0c9ac00
66 lines
1.6 KiB
C++
66 lines
1.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef dom_tabs_ContentThread_h
|
|
#define dom_tabs_ContentThread_h 1
|
|
|
|
#include "mozilla/ipc/ProcessChild.h"
|
|
#include "mozilla/ipc/ScopedXREEmbed.h"
|
|
#include "ContentChild.h"
|
|
|
|
#if defined(XP_WIN)
|
|
#include "mozilla/mscom/MainThreadRuntime.h"
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
/**
|
|
* ContentProcess is a singleton on the content process which represents
|
|
* the main thread where tab instances live.
|
|
*/
|
|
class ContentProcess : public mozilla::ipc::ProcessChild
|
|
{
|
|
typedef mozilla::ipc::ProcessChild ProcessChild;
|
|
|
|
public:
|
|
explicit ContentProcess(ProcessId aParentPid)
|
|
: ProcessChild(aParentPid)
|
|
{ }
|
|
|
|
~ContentProcess()
|
|
{ }
|
|
|
|
virtual bool Init() override;
|
|
virtual void CleanUp() override;
|
|
|
|
void SetAppDir(const nsACString& aPath);
|
|
|
|
#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
|
|
void SetProfile(const nsACString& aProfile);
|
|
#endif
|
|
|
|
private:
|
|
ContentChild mContent;
|
|
mozilla::ipc::ScopedXREEmbed mXREEmbed;
|
|
|
|
#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
|
|
nsCOMPtr<nsIFile> mProfileDir;
|
|
#endif
|
|
|
|
#if defined(XP_WIN)
|
|
// This object initializes and configures COM.
|
|
mozilla::mscom::MainThreadRuntime mCOMRuntime;
|
|
#endif
|
|
|
|
DISALLOW_EVIL_CONSTRUCTORS(ContentProcess);
|
|
};
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|
|
|
|
#endif // ifndef dom_tabs_ContentThread_h
|