Bug 1480244: Follow-up: Re-add kungFuDeathGrip for mTabChildMessageManager. r=bz
authorKris Maglione <maglione.k@gmail.com>
Wed, 15 Aug 2018 11:13:15 -0700
changeset 486879 376ec8be8307c9bf77ce1fee4c08f79aec3e7404
parent 486878 89c9c6ba40fd1f8819d9855433d97e5086bb74d2
child 486880 e7aaefc49e5f08eef8e4cbe8dc08fdc00e1ade45
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1480244
milestone63.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 1480244: Follow-up: Re-add kungFuDeathGrip for mTabChildMessageManager. r=bz
dom/ipc/TabChild.cpp
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -228,20 +228,19 @@ TabChildBase::DispatchMessageManagerMess
         ErrorResult rv;
         data.Write(cx, json, rv);
         if (NS_WARN_IF(rv.Failed())) {
             rv.SuppressException();
             return;
         }
     }
 
-    // Let the BrowserElementScrolling helper (if it exists) for this
-    // content manipulate the frame state.
-    RefPtr<nsFrameMessageManager> mm = mTabChildMessageManager->GetMessageManager();
-    mm->ReceiveMessage(static_cast<EventTarget*>(mTabChildMessageManager), nullptr,
+    RefPtr<TabChildMessageManager> kungFuDeathGrip(mTabChildMessageManager);
+    RefPtr<nsFrameMessageManager> mm = kungFuDeathGrip->GetMessageManager();
+    mm->ReceiveMessage(static_cast<EventTarget*>(kungFuDeathGrip), nullptr,
                        aMessageName, false, &data, nullptr, nullptr, nullptr,
                        IgnoreErrors());
 }
 
 bool
 TabChildBase::UpdateFrameHandler(const FrameMetrics& aFrameMetrics)
 {
   MOZ_ASSERT(aFrameMetrics.GetScrollId() != FrameMetrics::NULL_SCROLL_ID);