corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 686513 - RenderFrameParent::BuildDisplayList crash when shadow root layer is null; r=roc

Browse Source
This commit is contained in:
Oleg Romashin
2011-09-14 08:51:24 +01:00
parent b034a36ce7
commit a70c209fab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout/ipc/RenderFrameParent.cpp
View File

@@ -811,11 +811,12 @@ RenderFrameParent::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// We're the subdoc for <browser remote="true"> and it has // We're the subdoc for <browser remote="true"> and it has
// painted content. Display its shadow layer tree. // painted content. Display its shadow layer tree.
nsDisplayList shadowTree; nsDisplayList shadowTree;
if (aBuilder->IsForEventDelivery()) { ContainerLayer* container = GetRootLayer();
if (aBuilder->IsForEventDelivery() && container) {
nsRect bounds = aFrame->EnsureInnerView()->GetBounds(); nsRect bounds = aFrame->EnsureInnerView()->GetBounds();
ViewTransform offset = ViewTransform offset =
ViewTransform(GetRootFrameOffset(aFrame, aBuilder), 1, 1); ViewTransform(GetRootFrameOffset(aFrame, aBuilder), 1, 1);
BuildListForLayer(GetRootLayer(), mFrameLoader, offset, BuildListForLayer(container, mFrameLoader, offset,
aBuilder, shadowTree, aFrame); aBuilder, shadowTree, aFrame);
} else { } else {
shadowTree.AppendToTop( shadowTree.AppendToTop(