зеркало из https://github.com/mozilla/gecko-dev.git
Bug 998863: Fix non-unified build bustage r=bustage
--HG-- extra : rebase_source : 521f9fd6ce378021fa560c198b1d7b2f47ad4462
This commit is contained in:
Родитель
89fd9cfe33
Коммит
f7145ef6e9
|
@ -12,15 +12,14 @@
|
||||||
#include "mozilla/ipc/BrowserProcessSubThread.h"
|
#include "mozilla/ipc/BrowserProcessSubThread.h"
|
||||||
#include "mozilla/plugins/PluginMessageUtils.h"
|
#include "mozilla/plugins/PluginMessageUtils.h"
|
||||||
#include "mozilla/Telemetry.h"
|
#include "mozilla/Telemetry.h"
|
||||||
#include "mozilla/UniquePtr.h"
|
|
||||||
#include "nsThreadUtils.h"
|
#include "nsThreadUtils.h"
|
||||||
|
|
||||||
using std::vector;
|
using std::vector;
|
||||||
using std::string;
|
using std::string;
|
||||||
|
|
||||||
using namespace mozilla;
|
|
||||||
using mozilla::ipc::BrowserProcessSubThread;
|
using mozilla::ipc::BrowserProcessSubThread;
|
||||||
using mozilla::ipc::GeckoChildProcessHost;
|
using mozilla::ipc::GeckoChildProcessHost;
|
||||||
|
using mozilla::plugins::LaunchCompleteTask;
|
||||||
using mozilla::plugins::PluginProcessParent;
|
using mozilla::plugins::PluginProcessParent;
|
||||||
using base::ProcessArchitecture;
|
using base::ProcessArchitecture;
|
||||||
|
|
||||||
|
@ -44,7 +43,7 @@ PluginProcessParent::~PluginProcessParent()
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
PluginProcessParent::Launch(UniquePtr<LaunchCompleteTask> aLaunchCompleteTask)
|
PluginProcessParent::Launch(mozilla::UniquePtr<LaunchCompleteTask> aLaunchCompleteTask)
|
||||||
{
|
{
|
||||||
ProcessArchitecture currentArchitecture = base::GetCurrentProcessArchitecture();
|
ProcessArchitecture currentArchitecture = base::GetCurrentProcessArchitecture();
|
||||||
uint32_t containerArchitectures = GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin);
|
uint32_t containerArchitectures = GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin);
|
||||||
|
@ -79,7 +78,7 @@ PluginProcessParent::Launch(UniquePtr<LaunchCompleteTask> aLaunchCompleteTask)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mLaunchCompleteTask = Move(aLaunchCompleteTask);
|
mLaunchCompleteTask = mozilla::Move(aLaunchCompleteTask);
|
||||||
|
|
||||||
vector<string> args;
|
vector<string> args;
|
||||||
args.push_back(MungePluginDsoPath(mPluginFilePath));
|
args.push_back(MungePluginDsoPath(mPluginFilePath));
|
||||||
|
|
Загрузка…
Ссылка в новой задаче