mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
8aa2e840a6
- Bug 1268976 - Assert that the micro-task queues are empty upon destruction of CycleCollectedJSRuntime; r=mccr8 (a459a4af91) - Bug 1191354 part 1 - Clean up nsHTMLEditRules::GetHighestInlineParent; r=ehsan (a2f401887c) - Bug 1191354 part 2 - Clean up nsHTMLEditRules::CheckInterlinePosition; r=ehsan (75d3829eec) - Bug 1191354 part 3 - Clean up nsHTMLEditRules::InsertMozBRIfNeeded; r=ehsan (bedbba7c14) - Bug 772796 - Handle newlines correctly when joining <div> and <pre>. r=roc (323eaf4fe9) - Bug 1258085 - Avoid empty whitespace nodes when editing (b77825fb31) - Bug 1156062 part 4 - Clean up ns*EditRules::WillInsert; r=ehsan (f351557776) - Bug 1156062 part 5 - Make CreateBR return regular pointer; r=ehsan (8720917dee) - Bug 1156062 part 6 - Clean up nsHTMLEditRules::WillInsertBreak; r=ehsan (d71bca568f) - Bug 1156062 part 7 - Clean up nsHTMLEditRules::StandardBreakImpl; r=ehsan (625db32c02) - Bug 1156062 part 8 - Clean up nsHTMLEditRules::JoinBlocks; r=ehsan (266b6c5150) - Bug 1156062 part 9 - Clean up nsHTMLEditRules::WillAlign; r=masayuki (a6e3227001) - Bug 1156062 part 10 - Clean up MarginPropertyAtomForIndent; r=masayuki (28612e062c) - Bug 1184665 - Remove a spammy editor warning (a2db555918) - Bug 1156062 part 11 - Clean up nsHTMLEditRules::Before/AfterEdit; r=masayuki (6be722082e) - Bug 1156062 part 12 - Clean up nsHTMLEditRules::GetAlignment; r=masayuki (350be10ee8) - Bug 1190172 part 1 - Clean up nsHTMLEditor::SplitStyleAbovePoint; r=ehsan (ce5e360af6) - Bug 1145395 - Introduce an overload of nsHTMLEditor::SelElementPosition that takes an Element; r=ehsan (7ca9dfd2f8) - Bug 1190172 part 2 - Clean up nsHTMLEditor::ClearStyle; r=ehsan (84334514ad) - Bug 1190172 part 3 - Remove old method variants; r=ehsan (e042bd64d5) - Bug 1190172 part 4 - Remove unused nsHTMLEditor::HasAttr; r=ehsan (a4f1563465) - Bug 1190172 part 5 - Clean up nsHTMLEditor::NodeIsProperty; r=ehsan (98afb84bd4) - Bug 1190172 part 6 - Clean up nsHTMLEditor::RelativeFontChangeOnTextNode; r=ehsan (0bf036d206) - Bug 1190172 part 7 - Clean up nsHTMLEditor::PromoteInlineRange; r=ehsan (0a21347500) - Bug 1190172 part 8 - Clean up nsHTMLEditor::PromoteRangeIfStartsOrEndsInNamedAnchor; r=ehsan (78cf619036) - Bug 1190172 part 9 - Clean up nsHTMLEditor::ReturnInHeader; r=ehsan (1d8d151ff1) - Bug 1190172 part 10 - Clean up nsHTMLEditor::ReturnInListItem; r=ehsan (0ce94d3cb1) - Bug 1190172 part 11 - Clean up nsHTMLEditRules::IsEmptyBlock; r=ehsan (a8dc5092f8) - Bug 1190172 part 12 - Clean up nsHTMLEditRules::ExpandSelectionForDeletion; r=ehsan (3d4a87a56d) - Bug 1191354 part 4 - Clean up nsHTMLEditRules::AlignBlock; r=ehsan (b39372d726) - Bug 1191354 part 5 - Clean up nsHTMLEditRules::IsEmptyInline; r=ehsan (0b8ab19fd1) - Bug 1191354 part 6 - Clean up IsBlockNode/IsInlineNode in nsHTMLEditRules.cpp; r=ehsan (8ba8047e12) - Bug 1191354 part 7 - Clean up nsHTMLEditRules::CheckForInvisibleBR; r=ehsan (0bc61269bd) - Bug 1191354 part 8 - Typedefs in headers for readability; r=ehsan (50b43dc3e9) - Bug 1191354 part 9 - Remove old nsHTMLEditRules::ConvertListType variant; r=ehsan (871f1b30a5) - Bug 1191354 part 10 - More features for OwningNonNull; r=froydnj (8e365d079a) - Bug 1191354 part 11 - Clean up nsHTMLEditRules::WillOutdent; r=ehsan (0c59a81c10) - Bug 1191354 part 12 - Clean up nsHTMLEditRules::OutdentPartOfBlock; r=ehsan (243d7ab42f) - Bug 1191354 part 13 - Clean up nsHTMLEditRules::SplitBlock; r=ehsan (c1141ab04d) - Bug 1191356 part 1 - Clean up nsHTMLEditRules::RemoveListStructure; r=ehsan (1d2ad5faa6) - Bug 1191356 part 2 - Clean up nsHTMLEditor::RemoveBlockContainer; r=ehsan (a9d140f511) - Bug 1191356 part 3 - Clean up nsHTMLEditRules::MoveBlock; r=ehsan (6bc14cd40c) - Bug 1191356 part 4 - Clean up nsHTMLEditRules::MoveNodeSmart, MoveContents; r=ehsan (00e6536e47) - Bug 1191356 part 5 - Clean up nsHTMLEditRules::RelativeChangeIndentationOfElementNode; r=ehsan (c3139c7d90) - Bug 1191356 part 6 - Clean up nsHTMLEditRules::WillMakeBasicBlock; r=ehsan (b3f73c2e12) - Bug 1191356 part 7 - Clean up nsHTMLEditor::GetSelectionContainer; r=ehsan (091e999587) - Bug 1191356 part 8 - Clean up nsHTMLEditRules::WillAbsolutePosition; r=ehsan (9982c65a99) - Bug 1208884 - Fix a few null check ordering bugs in nsHTMLEditRules::SplitParagraph; r=roc (d04eece297) - Bug 1209037 - Eliminate some unneeded null checks; r=jdm (b35d5308c5) - Bug 1191356 part 9 - Convert nsHTMLEditRules::mNewBlock to Element; r=ehsan (f374780e22) - Bug 1253734 - Add some more editor things to CC traversal. r=mccr8. (94a0c77bb1) - Bug 1193762 part 1 - Remove nsEditor::IsBlockNode(nsIDOMNode*); r=ehsan (5e107cbdbb) - Bug 1193762 part 2 - Remove nsHTMLEditor::IsVisBreak(nsIDOMNode*); r=ehsan (5e61c27d21) - Bug 1193762 part 3 - Remove nsEditor::IsDescendantOfEditorRoot(nsIDOMNode*); r=ehsan (022a37d442) - Bug 1193762 part 4 - Avoid nsCOMPtr in ternary operator; r=froydnj (e4bc35cbe0) - Bug 1193762 part 5 - Convert DecodePool::threads to nsTArray; r=froydnj (c61f063f4d) - Bug 1193762 part 6 - Return raw pointer, not nsCOMPtr; r=froydnj (a43c30f92e) - Bug 1193762 part 7 - Use .get() when assigning to variables; r=froydnj (a61ad819f0) - Bug 1193762 part 8 - Fix things that will break; r=froydnj (40a76db662) - Bug 1193762 part 9 - Delete nsCOMPtr<T>::operator T*()&&; r=froydnj (022c1f0dba) - Bug 1168223 - Fix a crash caused by unexpected flushes under nsIEditor::SetFlags. r=ehsan (cc49d468b8) - Bug 1158837 - Ensure the start and end nodes are non-null before using them. r=roc (7c28121aa7) - Bug 1269047 - Remove chained ENSURE calls from GetStartNodeAndOffset. r=ehsan (f36c1c67aa) - Bug 1248078 - Remove the dedicated scroll acknowledgement message. r=botond (500b8d7574) - Bug 1260806: Remove some more dead MessageLoop code. r=jld (1c223cafe8) - Bug 1266595: Replace Chromium Task with Runnable. r=froydnj (5c1c056c83) - Bug 1242343 - p1. ConstructSystem32Path from LoadLibrarySystem32 - r=jimm (b28fcbc0c4) - Bug 1242343 - p2. Blacklist msmpeg2vdec.dll 12.0.9200.16426 & .17037 - r=cpearce (9a71795ab0) - Bug 1253395 - Disable msmpeg2vdec.dll blackslisting - r=cpearce (e1d4dc47be) - Bug 1242456 - Create RAIIs to manage HGLOBAL and printer HANDLE in ShowNativePrintDialog and CreateGlobalDevModeAndInit. r=jimm, r=bobowen (a22cecaebd) - Bug 1262399 - remove Impl suffixes from nsSupports* implementations; r=mccr8 (6733db9394) - Bug 1268772 (part 1) - Remove nsCheapSet::Put()'s return value. r=erahm. (5f3f553e84) - Bug 1268772 (part 2) - Make infallible nsVariant methods return |void| instead of |nsresult|. r=erahm. (22ae74fdaf) - Bug 1268772 (part 3) - Remove NS_NewWindowsRegKey()'s return value. r=erahm. (dc32bd698e) - Bug 1268772 (part 4) - Use MOZ_MUST_USE with NS_NewISupportsArray(). r=erahm. (e51ecfdf9f) - Bug 1268772 (part 5) - Use MOZ_MUST_USE in other parts of xpcom/ds/. r=erahm. (4d8a5183eb) - Bug 1266027 part 1 - make the MediaDecoderReaderWrapper as a proxy of requesting media data; r=jwwang (fbaa79019d) - Bug 1195601 - Remove MediaDecoderStateMachine::mLogicallySeeking. r=kinetik. (5ab1ff1ca0) - Bug 1266027 part 2 - make MDSM and SeekTask to adopt new MediaDecoderReaderWrapper API; r=jwwang (1961e26e80) - add mac specific dupes (4e4ff4b123) - Bug 1269262 - Unbreak build without NO_EXPAND_LIBS in js/src/moz.build after bug 1239083. r=ted (46d2dec64a) - Bug 1253215 - Initialize RequestSyncService only if its pref is enabled, r=ehsan (aec1b2f889) - Bug 1269303 - Remove RequestSync API, r=fabrice (f774336e34)
263 lines
8.7 KiB
C++
263 lines
8.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
* vim: sw=4 ts=4 et :
|
|
* 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/. */
|
|
|
|
#include "mozilla/plugins/PluginProcessParent.h"
|
|
|
|
#include "base/string_util.h"
|
|
#include "base/process_util.h"
|
|
|
|
#include "mozilla/ipc/BrowserProcessSubThread.h"
|
|
#include "mozilla/plugins/PluginMessageUtils.h"
|
|
#include "mozilla/Telemetry.h"
|
|
#include "nsThreadUtils.h"
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
#include "nsDirectoryServiceDefs.h"
|
|
#endif
|
|
|
|
using std::vector;
|
|
using std::string;
|
|
|
|
using mozilla::ipc::BrowserProcessSubThread;
|
|
using mozilla::ipc::GeckoChildProcessHost;
|
|
using mozilla::plugins::LaunchCompleteTask;
|
|
using mozilla::plugins::PluginProcessParent;
|
|
using base::ProcessArchitecture;
|
|
|
|
template<>
|
|
struct RunnableMethodTraits<PluginProcessParent>
|
|
{
|
|
static void RetainCallee(PluginProcessParent* obj) { }
|
|
static void ReleaseCallee(PluginProcessParent* obj) { }
|
|
};
|
|
|
|
PluginProcessParent::PluginProcessParent(const std::string& aPluginFilePath) :
|
|
GeckoChildProcessHost(GeckoProcessType_Plugin),
|
|
mPluginFilePath(aPluginFilePath),
|
|
mTaskFactory(this),
|
|
mMainMsgLoop(MessageLoop::current()),
|
|
mRunCompleteTaskImmediately(false)
|
|
{
|
|
}
|
|
|
|
PluginProcessParent::~PluginProcessParent()
|
|
{
|
|
}
|
|
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
static void
|
|
AddSandboxAllowedFile(vector<std::wstring>& aAllowedFiles, nsIProperties* aDirSvc,
|
|
const char* aDir, const nsAString& aSuffix = EmptyString())
|
|
{
|
|
nsCOMPtr<nsIFile> userDir;
|
|
nsresult rv = aDirSvc->Get(aDir, NS_GET_IID(nsIFile), getter_AddRefs(userDir));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return;
|
|
}
|
|
|
|
nsAutoString userDirPath;
|
|
rv = userDir->GetPath(userDirPath);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return;
|
|
}
|
|
|
|
if (!aSuffix.IsEmpty()) {
|
|
userDirPath.Append(aSuffix);
|
|
}
|
|
aAllowedFiles.push_back(std::wstring(userDirPath.get()));
|
|
return;
|
|
}
|
|
|
|
static void
|
|
AddSandboxAllowedFiles(int32_t aSandboxLevel,
|
|
vector<std::wstring>& aAllowedFilesRead,
|
|
vector<std::wstring>& aAllowedFilesReadWrite,
|
|
vector<std::wstring>& aAllowedDirectories)
|
|
{
|
|
if (aSandboxLevel < 2) {
|
|
return;
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIProperties> dirSvc =
|
|
do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return;
|
|
}
|
|
|
|
// Higher than level 2 currently removes the users own rights.
|
|
if (aSandboxLevel > 2) {
|
|
AddSandboxAllowedFile(aAllowedFilesRead, dirSvc, NS_WIN_HOME_DIR);
|
|
AddSandboxAllowedFile(aAllowedFilesRead, dirSvc, NS_WIN_HOME_DIR,
|
|
NS_LITERAL_STRING("\\*"));
|
|
}
|
|
|
|
// Level 2 and above is now using low integrity, so we need to give write
|
|
// access to the Flash directories. Access also has to be given to create
|
|
// the parent directories as they may not exist.
|
|
// This should be made Flash specific (Bug 1171396).
|
|
AddSandboxAllowedFile(aAllowedFilesReadWrite, dirSvc, NS_WIN_APPDATA_DIR,
|
|
NS_LITERAL_STRING("\\Macromedia\\Flash Player\\*"));
|
|
AddSandboxAllowedFile(aAllowedDirectories, dirSvc, NS_WIN_APPDATA_DIR,
|
|
NS_LITERAL_STRING("\\Macromedia\\Flash Player"));
|
|
AddSandboxAllowedFile(aAllowedDirectories, dirSvc, NS_WIN_APPDATA_DIR,
|
|
NS_LITERAL_STRING("\\Macromedia"));
|
|
AddSandboxAllowedFile(aAllowedFilesReadWrite, dirSvc, NS_WIN_APPDATA_DIR,
|
|
NS_LITERAL_STRING("\\Adobe\\Flash Player\\*"));
|
|
AddSandboxAllowedFile(aAllowedDirectories, dirSvc, NS_WIN_APPDATA_DIR,
|
|
NS_LITERAL_STRING("\\Adobe\\Flash Player"));
|
|
AddSandboxAllowedFile(aAllowedDirectories, dirSvc, NS_WIN_APPDATA_DIR,
|
|
NS_LITERAL_STRING("\\Adobe"));
|
|
|
|
// Write access to the Temp directory is needed in some mochitest crash
|
|
// tests.
|
|
// Bug 1171393 tracks removing this requirement.
|
|
AddSandboxAllowedFile(aAllowedFilesReadWrite, dirSvc, NS_OS_TEMP_DIR,
|
|
NS_LITERAL_STRING("\\*"));
|
|
}
|
|
#endif
|
|
|
|
bool
|
|
PluginProcessParent::Launch(mozilla::UniquePtr<LaunchCompleteTask> aLaunchCompleteTask,
|
|
int32_t aSandboxLevel)
|
|
{
|
|
#if defined(XP_WIN) && defined(MOZ_SANDBOX)
|
|
mSandboxLevel = aSandboxLevel;
|
|
AddSandboxAllowedFiles(mSandboxLevel, mAllowedFilesRead,
|
|
mAllowedFilesReadWrite, mAllowedDirectories);
|
|
#else
|
|
if (aSandboxLevel != 0) {
|
|
MOZ_ASSERT(false,
|
|
"Can't enable an NPAPI process sandbox for platform/build.");
|
|
}
|
|
#endif
|
|
|
|
ProcessArchitecture currentArchitecture = base::GetCurrentProcessArchitecture();
|
|
uint32_t containerArchitectures = GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin);
|
|
|
|
uint32_t pluginLibArchitectures = currentArchitecture;
|
|
#ifdef XP_MACOSX
|
|
nsresult rv = GetArchitecturesForBinary(mPluginFilePath.c_str(), &pluginLibArchitectures);
|
|
if (NS_FAILED(rv)) {
|
|
// If the call failed just assume that we want the current architecture.
|
|
pluginLibArchitectures = currentArchitecture;
|
|
}
|
|
#endif
|
|
|
|
ProcessArchitecture selectedArchitecture = currentArchitecture;
|
|
if (!(pluginLibArchitectures & containerArchitectures & currentArchitecture)) {
|
|
// Prefererence in order: x86_64, i386, PPC. The only particularly important thing
|
|
// about this order is that we'll prefer 64-bit architectures first.
|
|
if (base::PROCESS_ARCH_X86_64 & pluginLibArchitectures & containerArchitectures) {
|
|
selectedArchitecture = base::PROCESS_ARCH_X86_64;
|
|
}
|
|
else if (base::PROCESS_ARCH_I386 & pluginLibArchitectures & containerArchitectures) {
|
|
selectedArchitecture = base::PROCESS_ARCH_I386;
|
|
}
|
|
else if (base::PROCESS_ARCH_PPC & pluginLibArchitectures & containerArchitectures) {
|
|
selectedArchitecture = base::PROCESS_ARCH_PPC;
|
|
}
|
|
else if (base::PROCESS_ARCH_ARM & pluginLibArchitectures & containerArchitectures) {
|
|
selectedArchitecture = base::PROCESS_ARCH_ARM;
|
|
}
|
|
else if (base::PROCESS_ARCH_MIPS & pluginLibArchitectures & containerArchitectures) {
|
|
selectedArchitecture = base::PROCESS_ARCH_MIPS;
|
|
}
|
|
else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
mLaunchCompleteTask = mozilla::Move(aLaunchCompleteTask);
|
|
|
|
vector<string> args;
|
|
args.push_back(MungePluginDsoPath(mPluginFilePath));
|
|
|
|
bool result = AsyncLaunch(args, selectedArchitecture);
|
|
if (!result) {
|
|
mLaunchCompleteTask = nullptr;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void
|
|
PluginProcessParent::Delete()
|
|
{
|
|
MessageLoop* currentLoop = MessageLoop::current();
|
|
MessageLoop* ioLoop = XRE_GetIOMessageLoop();
|
|
|
|
if (currentLoop == ioLoop) {
|
|
delete this;
|
|
return;
|
|
}
|
|
|
|
ioLoop->PostTask(NewRunnableMethod(this, &PluginProcessParent::Delete));
|
|
}
|
|
|
|
void
|
|
PluginProcessParent::SetCallRunnableImmediately(bool aCallImmediately)
|
|
{
|
|
mRunCompleteTaskImmediately = aCallImmediately;
|
|
}
|
|
|
|
/**
|
|
* This function exists so that we may provide an additional level of
|
|
* indirection between the task being posted to main event loop (a
|
|
* RunnableMethod) and the launch complete task itself. This is needed
|
|
* for cases when both WaitUntilConnected or OnChannel* race to invoke the
|
|
* task.
|
|
*/
|
|
void
|
|
PluginProcessParent::RunLaunchCompleteTask()
|
|
{
|
|
if (mLaunchCompleteTask) {
|
|
mLaunchCompleteTask->Run();
|
|
mLaunchCompleteTask = nullptr;
|
|
}
|
|
}
|
|
|
|
bool
|
|
PluginProcessParent::WaitUntilConnected(int32_t aTimeoutMs)
|
|
{
|
|
bool result = GeckoChildProcessHost::WaitUntilConnected(aTimeoutMs);
|
|
if (mRunCompleteTaskImmediately && mLaunchCompleteTask) {
|
|
if (result) {
|
|
mLaunchCompleteTask->SetLaunchSucceeded();
|
|
}
|
|
RunLaunchCompleteTask();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void
|
|
PluginProcessParent::OnChannelConnected(int32_t peer_pid)
|
|
{
|
|
GeckoChildProcessHost::OnChannelConnected(peer_pid);
|
|
if (mLaunchCompleteTask && !mRunCompleteTaskImmediately) {
|
|
mLaunchCompleteTask->SetLaunchSucceeded();
|
|
mMainMsgLoop->PostTask(mTaskFactory.NewRunnableMethod(
|
|
&PluginProcessParent::RunLaunchCompleteTask));
|
|
}
|
|
}
|
|
|
|
void
|
|
PluginProcessParent::OnChannelError()
|
|
{
|
|
GeckoChildProcessHost::OnChannelError();
|
|
if (mLaunchCompleteTask && !mRunCompleteTaskImmediately) {
|
|
mMainMsgLoop->PostTask(mTaskFactory.NewRunnableMethod(
|
|
&PluginProcessParent::RunLaunchCompleteTask));
|
|
}
|
|
}
|
|
|
|
bool
|
|
PluginProcessParent::IsConnected()
|
|
{
|
|
mozilla::MonitorAutoLock lock(mMonitor);
|
|
return mProcessState == PROCESS_CONNECTED;
|
|
}
|
|
|