Bug 1405783 - Fix how CompositorManagerChild::InitSameProcess used the process ID instead of the token. r=me
authorAndrew Osmond <aosmond@mozilla.com>
Thu, 05 Oct 2017 08:48:17 -0400
changeset 384688 e16347aa774bae92a677bf484d84a5a5c0c60152
parent 384687 d06512adfab5cc90d985a1b814e8ba3dc4b81fff
child 384689 0b50187d11f9299a66c2ea797943dcbb2a1ab2aa
push id95822
push useraosmond@gmail.com
push dateThu, 05 Oct 2017 12:48:27 +0000
treeherdermozilla-inbound@e16347aa774b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1405783
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1405783 - Fix how CompositorManagerChild::InitSameProcess used the process ID instead of the token. r=me
gfx/layers/ipc/CompositorManagerChild.cpp
--- a/gfx/layers/ipc/CompositorManagerChild.cpp
+++ b/gfx/layers/ipc/CompositorManagerChild.cpp
@@ -31,17 +31,17 @@ CompositorManagerChild::IsInitialized(ui
          sInstance->mProcessToken == aProcessToken;
 }
 
 /* static */ void
 CompositorManagerChild::InitSameProcess(uint32_t aNamespace,
                                         uint64_t aProcessToken)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (NS_WARN_IF(IsInitialized(base::GetCurrentProcId()))) {
+  if (NS_WARN_IF(IsInitialized(aProcessToken))) {
     MOZ_ASSERT_UNREACHABLE("Already initialized same process");
     return;
   }
 
   RefPtr<CompositorManagerParent> parent =
     CompositorManagerParent::CreateSameProcess();
   RefPtr<CompositorManagerChild> child =
     new CompositorManagerChild(parent, aProcessToken, aNamespace);