Bug 1467867 - Ensure we populate the event regions overrides properly
MozReview-Commit-ID: 4EyOHYena3V
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -348,26 +348,24 @@ RenderFrameParent::EnsureLayersConnected
nsDisplayRemote::nsDisplayRemote(nsDisplayListBuilder* aBuilder,
nsSubDocumentFrame* aFrame,
RenderFrameParent* aRemoteFrame)
: nsDisplayItem(aBuilder, aFrame)
, mRemoteFrame(aRemoteFrame)
, mEventRegionsOverride(EventRegionsOverride::NoOverride)
{
- if (aBuilder->IsBuildingLayerEventRegions()) {
- bool frameIsPointerEventsNone =
- aFrame->StyleUserInterface()->GetEffectivePointerEvents(aFrame) ==
- NS_STYLE_POINTER_EVENTS_NONE;
- if (aBuilder->IsInsidePointerEventsNoneDoc() || frameIsPointerEventsNone) {
- mEventRegionsOverride |= EventRegionsOverride::ForceEmptyHitRegion;
- }
- if (nsLayoutUtils::HasDocumentLevelListenersForApzAwareEvents(aFrame->PresShell())) {
- mEventRegionsOverride |= EventRegionsOverride::ForceDispatchToContent;
- }
+ bool frameIsPointerEventsNone =
+ aFrame->StyleUserInterface()->GetEffectivePointerEvents(aFrame) ==
+ NS_STYLE_POINTER_EVENTS_NONE;
+ if (aBuilder->IsInsidePointerEventsNoneDoc() || frameIsPointerEventsNone) {
+ mEventRegionsOverride |= EventRegionsOverride::ForceEmptyHitRegion;
+ }
+ if (nsLayoutUtils::HasDocumentLevelListenersForApzAwareEvents(aFrame->PresShell())) {
+ mEventRegionsOverride |= EventRegionsOverride::ForceDispatchToContent;
}
}
already_AddRefed<Layer>
nsDisplayRemote::BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters)
{