mozilla-beta: changeset 497669:8a1bcc91affb90fbdb0f36d5c45d0629e4b43622

author	Miko Mynttinen <mikokm@gmail.com>
	Thu, 18 Oct 2018 02:26:59 +0000
changeset 497669	8a1bcc91affb90fbdb0f36d5c45d0629e4b43622
parent 497668	3a18b352f6fb76d157dd54ea1cb8e1ba6c35d97f
child 497670	c645265aa5b827fac52c3692991cbd55558d5821
push id	10002
push user	archaeopteryx@coole-files.de
push date	Fri, 19 Oct 2018 23:09:29 +0000
treeherder	mozilla-beta@01378c910610 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mattwoodrow
bugs	1496839
milestone	64.0a1
first release with	nightly linux32 c0c288dc283e / 64.0a1 / 20181018220439 / files nightly linux64 6c55991a052e / 64.0a1 / 20181019005426 / files nightly mac c0c288dc283e / 64.0a1 / 20181018220439 / files nightly win32 6c55991a052e / 64.0a1 / 20181019005426 / files nightly win64 6c55991a052e / 64.0a1 / 20181019005426 / files
last release without	nightly linux32 8f709fd4aa46 / 64.0a1 / 20181018123730 / files nightly linux64 8f709fd4aa46 / 64.0a1 / 20181018123730 / files nightly mac 8f709fd4aa46 / 64.0a1 / 20181018123730 / files nightly win32 8f709fd4aa46 / 64.0a1 / 20181018123730 / files nightly win64 8f709fd4aa46 / 64.0a1 / 20181018123730 / files

--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -434,10 +434,12 @@ nsDisplayRemote::GetRemoteLayersId() con
 {
   MOZ_ASSERT(GetRenderFrameParent());
   return GetRenderFrameParent()->GetLayersId();
 }
 
 mozilla::layout::RenderFrameParent*
 nsDisplayRemote::GetRenderFrameParent() const
 {
-  return static_cast<nsSubDocumentFrame*>(Frame())->GetRenderFrameParent();
+  return mFrame
+    ? static_cast<nsSubDocumentFrame*>(mFrame)->GetRenderFrameParent()
+    : nullptr;
 }