Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset a6780188f669 (bug 1314543) for suspicion this cause perma windows 7 xpcshell failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-03-17 10:57:41 +01:00
parent 4fca90dedd
commit c3b7907400
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/ipc/GPUChild.cpp
View File

@ -72,22 +72,19 @@ GPUChild::OnVarChanged(const GfxVarUpdate& aVar)
SendUpdateVar(aVar);
}
bool
void
GPUChild::EnsureGPUReady()
{
if (mGPUReady) {
return true;
return;
}
GPUDeviceData data;
if (!SendGetDeviceStatus(&data)) {
return false;
}
SendGetDeviceStatus(&data);
gfxPlatform::GetPlatform()->ImportGPUDeviceData(data);
Telemetry::AccumulateTimeDelta(Telemetry::GPU_PROCESS_LAUNCH_TIME_MS_2, mHost->GetLaunchTime());
mGPUReady = true;
return true;
}
mozilla::ipc::IPCResult

2
gfx/ipc/GPUChild.h
View File

@ -34,7 +34,7 @@ public:
void Init();
bool EnsureGPUReady();
void EnsureGPUReady();
// gfxVarReceiver overrides.
void OnVarChanged(const GfxVarUpdate& aVar) override;

43
gfx/ipc/GPUProcessManager.cpp
View File

@ -163,7 +163,7 @@ GPUProcessManager::DisableGPUProcess(const char* aMessage)
ShutdownVsyncIOThread();
}
bool
void
GPUProcessManager::EnsureGPUReady()
{
if (mProcess && !mProcess->IsConnected()) {
@ -171,15 +171,13 @@ GPUProcessManager::EnsureGPUReady()
// If this fails, we should have fired OnProcessLaunchComplete and
// removed the process.
MOZ_ASSERT(!mProcess && !mGPUChild);
return false;
return;
}
}
if (mGPUChild && mGPUChild->EnsureGPUReady()) {
return true;
if (mGPUChild) {
mGPUChild->EnsureGPUReady();
}
return false;
}
void
@ -189,7 +187,9 @@ GPUProcessManager::EnsureImageBridgeChild()
return;
}
if (!EnsureGPUReady()) {
EnsureGPUReady();
if (!mGPUChild) {
ImageBridgeChild::InitSameProcess();
return;
}
@ -217,7 +217,9 @@ GPUProcessManager::EnsureVRManager()
return;
}
if (!EnsureGPUReady()) {
EnsureGPUReady();
if (!mGPUChild) {
VRManagerChild::InitSameProcess();
return;
}
@ -246,13 +248,15 @@ GPUProcessManager::EnsureUiCompositorController()
return;
}
EnsureGPUReady();
RefPtr<nsThread> uiThread;
uiThread = GetAndroidUiThread();
MOZ_ASSERT(uiThread);
if (!EnsureGPUReady()) {
if (!mGPUChild) {
UiCompositorControllerChild::InitSameProcess(uiThread);
return;
}
@ -542,13 +546,14 @@ GPUProcessManager::CreateTopLevelCompositor(nsBaseWidget* aWidget,
{
uint64_t layerTreeId = AllocateLayerTreeId();
EnsureGPUReady();
EnsureImageBridgeChild();
EnsureVRManager();
#if defined(MOZ_WIDGET_ANDROID)
EnsureUiCompositorController();
#endif // defined(MOZ_WIDGET_ANDROID)
if (EnsureGPUReady()) {
if (mGPUChild) {
RefPtr<CompositorSession> session = CreateRemoteSession(
aWidget,
aLayerManager,
@ -677,6 +682,8 @@ bool
GPUProcessManager::CreateContentCompositorBridge(base::ProcessId aOtherProcess,
ipc::Endpoint<PCompositorBridgeChild>* aOutEndpoint)
{
EnsureGPUReady();
ipc::Endpoint<PCompositorBridgeParent> parentPipe;
ipc::Endpoint<PCompositorBridgeChild> childPipe;
@ -694,7 +701,7 @@ GPUProcessManager::CreateContentCompositorBridge(base::ProcessId aOtherProcess,
return false;
}
if (EnsureGPUReady()) {
if (mGPUChild) {
mGPUChild->SendNewContentCompositorBridge(Move(parentPipe));
} else {
if (!CompositorBridgeParent::CreateForContent(Move(parentPipe))) {
@ -728,7 +735,7 @@ GPUProcessManager::CreateContentImageBridge(base::ProcessId aOtherProcess,
return false;
}
if (EnsureGPUReady()) {
if (mGPUChild) {
mGPUChild->SendNewContentImageBridge(Move(parentPipe));
} else {
if (!ImageBridgeParent::CreateForContent(Move(parentPipe))) {
@ -771,7 +778,7 @@ GPUProcessManager::CreateContentVRManager(base::ProcessId aOtherProcess,
return false;
}
if (EnsureGPUReady()) {
if (mGPUChild) {
mGPUChild->SendNewContentVRManager(Move(parentPipe));
} else {
if (!VRManagerParent::CreateForContent(Move(parentPipe))) {
@ -787,7 +794,7 @@ void
GPUProcessManager::CreateContentVideoDecoderManager(base::ProcessId aOtherProcess,
ipc::Endpoint<dom::PVideoDecoderManagerChild>* aOutEndpoint)
{
if (!EnsureGPUReady() || !MediaPrefs::PDMUseGPUDecoder()) {
if (!mGPUChild || !MediaPrefs::PDMUseGPUDecoder()) {
return;
}
@ -821,7 +828,7 @@ GPUProcessManager::MapLayerTreeId(uint64_t aLayersId, base::ProcessId aOwningId)
{
LayerTreeOwnerTracker::Get()->Map(aLayersId, aOwningId);
if (EnsureGPUReady()) {
if (mGPUChild) {
AutoTArray<LayerTreeIdMapping, 1> mappings;
mappings.AppendElement(LayerTreeIdMapping(aLayersId, aOwningId));
mGPUChild->SendAddLayerTreeIdMapping(mappings);
@ -833,7 +840,7 @@ GPUProcessManager::UnmapLayerTreeId(uint64_t aLayersId, base::ProcessId aOwningI
{
LayerTreeOwnerTracker::Get()->Unmap(aLayersId, aOwningId);
if (EnsureGPUReady()) {
if (mGPUChild) {
mGPUChild->SendRemoveLayerTreeIdMapping(LayerTreeIdMapping(aLayersId, aOwningId));
return;
}
@ -897,7 +904,7 @@ GPUProcessManager::RemoveListener(GPUProcessListener* aListener)
bool
GPUProcessManager::NotifyGpuObservers(const char* aTopic)
{
if (!EnsureGPUReady()) {
if (!mGPUChild) {
return false;
}
nsCString topic(aTopic);
@ -955,7 +962,7 @@ protected:
RefPtr<MemoryReportingProcess>
GPUProcessManager::GetProcessMemoryReporter()
{
if (!EnsureGPUReady()) {
if (!mGPUChild) {
return nullptr;
}
return new GPUMemoryReporter();

2
gfx/ipc/GPUProcessManager.h
View File

@ -80,7 +80,7 @@ public:
// Ensure that GPU-bound methods can be used. If no GPU process is being
// used, or one is launched and ready, this function returns immediately.
// Otherwise it blocks until the GPU process has finished launching.
bool EnsureGPUReady();
void EnsureGPUReady();
RefPtr<CompositorSession> CreateTopLevelCompositor(
nsBaseWidget* aWidget,