зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 19e021ef5ba1 (bug 1216288)
This commit is contained in:
Родитель
10791e232a
Коммит
aa60675f7f
|
@ -61,7 +61,6 @@ struct ContainerLayerParameters {
|
||||||
, mInActiveTransformedSubtree(false)
|
, mInActiveTransformedSubtree(false)
|
||||||
, mDisableSubpixelAntialiasingInDescendants(false)
|
, mDisableSubpixelAntialiasingInDescendants(false)
|
||||||
, mInLowPrecisionDisplayPort(false)
|
, mInLowPrecisionDisplayPort(false)
|
||||||
, mForEventsOnly(false)
|
|
||||||
{}
|
{}
|
||||||
ContainerLayerParameters(float aXScale, float aYScale)
|
ContainerLayerParameters(float aXScale, float aYScale)
|
||||||
: mXScale(aXScale)
|
: mXScale(aXScale)
|
||||||
|
@ -72,7 +71,6 @@ struct ContainerLayerParameters {
|
||||||
, mInActiveTransformedSubtree(false)
|
, mInActiveTransformedSubtree(false)
|
||||||
, mDisableSubpixelAntialiasingInDescendants(false)
|
, mDisableSubpixelAntialiasingInDescendants(false)
|
||||||
, mInLowPrecisionDisplayPort(false)
|
, mInLowPrecisionDisplayPort(false)
|
||||||
, mForEventsOnly(false)
|
|
||||||
{}
|
{}
|
||||||
ContainerLayerParameters(float aXScale, float aYScale,
|
ContainerLayerParameters(float aXScale, float aYScale,
|
||||||
const nsIntPoint& aOffset,
|
const nsIntPoint& aOffset,
|
||||||
|
@ -86,7 +84,6 @@ struct ContainerLayerParameters {
|
||||||
, mInActiveTransformedSubtree(aParent.mInActiveTransformedSubtree)
|
, mInActiveTransformedSubtree(aParent.mInActiveTransformedSubtree)
|
||||||
, mDisableSubpixelAntialiasingInDescendants(aParent.mDisableSubpixelAntialiasingInDescendants)
|
, mDisableSubpixelAntialiasingInDescendants(aParent.mDisableSubpixelAntialiasingInDescendants)
|
||||||
, mInLowPrecisionDisplayPort(aParent.mInLowPrecisionDisplayPort)
|
, mInLowPrecisionDisplayPort(aParent.mInLowPrecisionDisplayPort)
|
||||||
, mForEventsOnly(aParent.mForEventsOnly)
|
|
||||||
{}
|
{}
|
||||||
|
|
||||||
float mXScale, mYScale;
|
float mXScale, mYScale;
|
||||||
|
@ -115,7 +112,6 @@ struct ContainerLayerParameters {
|
||||||
bool mInActiveTransformedSubtree;
|
bool mInActiveTransformedSubtree;
|
||||||
bool mDisableSubpixelAntialiasingInDescendants;
|
bool mDisableSubpixelAntialiasingInDescendants;
|
||||||
bool mInLowPrecisionDisplayPort;
|
bool mInLowPrecisionDisplayPort;
|
||||||
bool mForEventsOnly;
|
|
||||||
/**
|
/**
|
||||||
* When this is false, PaintedLayer coordinates are drawn to with an integer
|
* When this is false, PaintedLayer coordinates are drawn to with an integer
|
||||||
* translation and the scale in mXScale/mYScale.
|
* translation and the scale in mXScale/mYScale.
|
||||||
|
|
|
@ -3932,11 +3932,9 @@ already_AddRefed<Layer>
|
||||||
nsDisplayOpacity::BuildLayer(nsDisplayListBuilder* aBuilder,
|
nsDisplayOpacity::BuildLayer(nsDisplayListBuilder* aBuilder,
|
||||||
LayerManager* aManager,
|
LayerManager* aManager,
|
||||||
const ContainerLayerParameters& aContainerParameters) {
|
const ContainerLayerParameters& aContainerParameters) {
|
||||||
ContainerLayerParameters params = aContainerParameters;
|
|
||||||
params.mForEventsOnly = mForEventsOnly;
|
|
||||||
RefPtr<Layer> container = aManager->GetLayerBuilder()->
|
RefPtr<Layer> container = aManager->GetLayerBuilder()->
|
||||||
BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
|
BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
|
||||||
params, nullptr,
|
aContainerParameters, nullptr,
|
||||||
FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
|
FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
|
||||||
if (!container)
|
if (!container)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
|
@ -388,9 +388,7 @@ RenderFrameParent::BuildLayer(nsDisplayListBuilder* aBuilder,
|
||||||
// draw a manager's subtree. The latter is bad bad bad, but the the
|
// 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
|
// MOZ_ASSERT() above will flag it. Returning nullptr here will just
|
||||||
// cause the shadow subtree not to be rendered.
|
// 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;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче