Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 19e021ef5ba1 (bug 1216288)

Browse Source
This commit is contained in:
Nigel Babu 2015-11-03 11:59:05 +05:30
parent 10791e232a
commit aa60675f7f
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/FrameLayerBuilder.h
View File

@ -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.

4
layout/base/nsDisplayList.cpp
View File

@ -3932,11 +3932,9 @@ already_AddRefed<Layer>
nsDisplayOpacity::BuildLayer(nsDisplayListBuilder* aBuilder,
LayerManager* aManager,
const ContainerLayerParameters& aContainerParameters) {
ContainerLayerParameters params = aContainerParameters;
params.mForEventsOnly = mForEventsOnly;
RefPtr<Layer> container = aManager->GetLayerBuilder()->
BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
params, nullptr,
aContainerParameters, nullptr,
FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
if (!container)
return nullptr;

4
layout/ipc/RenderFrameParent.cpp
View File

@ -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;
}