diff --git a/layout/base/FrameLayerBuilder.h b/layout/base/FrameLayerBuilder.h index 2a1da5cc2daf..9f8e395c894b 100644 --- a/layout/base/FrameLayerBuilder.h +++ b/layout/base/FrameLayerBuilder.h @@ -61,7 +61,6 @@ struct ContainerLayerParameters { , mInActiveTransformedSubtree(false) , mDisableSubpixelAntialiasingInDescendants(false) , mInLowPrecisionDisplayPort(false) - , mForEventsOnly(false) {} ContainerLayerParameters(float aXScale, float aYScale) : mXScale(aXScale) @@ -72,7 +71,6 @@ struct ContainerLayerParameters { , mInActiveTransformedSubtree(false) , mDisableSubpixelAntialiasingInDescendants(false) , mInLowPrecisionDisplayPort(false) - , mForEventsOnly(false) {} ContainerLayerParameters(float aXScale, float aYScale, const nsIntPoint& aOffset, @@ -86,7 +84,6 @@ struct ContainerLayerParameters { , mInActiveTransformedSubtree(aParent.mInActiveTransformedSubtree) , mDisableSubpixelAntialiasingInDescendants(aParent.mDisableSubpixelAntialiasingInDescendants) , mInLowPrecisionDisplayPort(aParent.mInLowPrecisionDisplayPort) - , mForEventsOnly(aParent.mForEventsOnly) {} float mXScale, mYScale; @@ -115,7 +112,6 @@ struct ContainerLayerParameters { bool mInActiveTransformedSubtree; bool mDisableSubpixelAntialiasingInDescendants; bool mInLowPrecisionDisplayPort; - bool mForEventsOnly; /** * When this is false, PaintedLayer coordinates are drawn to with an integer * translation and the scale in mXScale/mYScale. diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 4f48ff4a89b8..11dcbef8b439 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -3932,11 +3932,9 @@ already_AddRefed nsDisplayOpacity::BuildLayer(nsDisplayListBuilder* aBuilder, LayerManager* aManager, const ContainerLayerParameters& aContainerParameters) { - ContainerLayerParameters params = aContainerParameters; - params.mForEventsOnly = mForEventsOnly; RefPtr container = aManager->GetLayerBuilder()-> BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList, - params, nullptr, + aContainerParameters, nullptr, FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR); if (!container) return nullptr; diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp index 4f1b07faa1e8..7f38a395e3db 100644 --- a/layout/ipc/RenderFrameParent.cpp +++ b/layout/ipc/RenderFrameParent.cpp @@ -388,9 +388,7 @@ RenderFrameParent::BuildLayer(nsDisplayListBuilder* aBuilder, // draw a manager's subtree. The latter is bad bad bad, but the the // MOZ_ASSERT() above will flag it. Returning nullptr here will just // cause the shadow subtree not to be rendered. - if (!aContainerParameters.mForEventsOnly) { - NS_WARNING("Remote iframe not rendered"); - } + NS_WARNING("Remote iframe not rendered"); return nullptr; }