Bug 1352237 - Fix a rebasing mistake so that we actually get profiles from the GPU process. r?dvander draft
authorMarkus Stange <mstange@themasta.com>
Thu, 30 Mar 2017 17:58:25 -0400
changeset 553869 0b2366994a6666ca815f843fa9757e192522bd9a
parent 553822 8df9fabf2587b7020889755acb9e75b664fe13cf
child 554516 886298ba4962872688f27575a0ffb5cf6297cd3c
push id51810
push userbmo:mstange@themasta.com
push dateThu, 30 Mar 2017 21:58:46 +0000
reviewersdvander
bugs1352237
milestone55.0a1
Bug 1352237 - Fix a rebasing mistake so that we actually get profiles from the GPU process. r?dvander MozReview-Commit-ID: A7SdPTl6rQ
gfx/ipc/GPUChild.cpp
--- 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