Bug 1352237 - Fix a rebasing mistake so that we actually get profiles from the GPU process. r?dvander
MozReview-Commit-ID: A7SdPTl6rQ
--- a/gfx/ipc/GPUChild.cpp
+++ b/gfx/ipc/GPUChild.cpp
@@ -64,18 +64,18 @@ GPUChild::Init()
devicePrefs.d3d11Compositing() = gfxConfig::GetValue(Feature::D3D11_COMPOSITING);
devicePrefs.oglCompositing() = gfxConfig::GetValue(Feature::OPENGL_COMPOSITING);
devicePrefs.useD2D1() = gfxConfig::GetValue(Feature::DIRECT2D);
SendInit(prefs, updates, devicePrefs);
gfxVars::AddReceiver(this);
-#ifdef MOZ_ENABLE_PROFILER_SPS
- mProfilerController = CrossProcessProfilerController::ForProtocol(this);
+#ifdef MOZ_GECKO_PROFILER
+ mProfilerController = MakeUnique<CrossProcessProfilerController>(this);
#endif
}
void
GPUChild::OnVarChanged(const GfxVarUpdate& aVar)
{
SendUpdateVar(aVar);
}
@@ -281,17 +281,17 @@ GPUChild::ActorDestroy(ActorDestroyReaso
// Notify the Telemetry environment so that we can refresh and do a subsession split
if (nsCOMPtr<nsIObserverService> obsvc = services::GetObserverService()) {
obsvc->NotifyObservers(nullptr, "compositor:process-aborted", nullptr);
}
}
-#ifdef MOZ_ENABLE_PROFILER_SPS
+#ifdef MOZ_GECKO_PROFILER
mProfilerController = nullptr;
#endif
gfxVars::RemoveReceiver(this);
mHost->OnChannelClosed();
}
class DeferredDeleteGPUChild : public Runnable