Backed out changeset f12d7d68b685 (bug 1022612)

This commit is contained in:
Carsten "Tomcat" Book 2014-07-15 10:29:48 +02:00
parent 75f0b66945
commit abd220850c
2 changed files with 1 additions and 11 deletions

View File

@ -2600,12 +2600,6 @@ ContainerState::ComputeOpaqueRect(nsDisplayItem* aItem,
opaqueClipped.Contains(mContainerBounds)) {
aList->SetIsOpaque();
}
// Add opaque areas to the "exclude glass" region. Only do this for
// ThebesLayers which are direct children of the root layer; this means
// they can't have transforms or opacity wrapping them.
if (!mContainerLayer->GetParent() && mBuilder->HasGlass()) {
mBuilder->AddExcludedGlassRegion(opaqueClipped);
}
opaquePixels = ScaleRegionToInsidePixels(opaqueClipped, snapOpaque);
if (aFixedPosFrame && ItemCoversScrollableArea(aItem, opaque)) {
*aHideAllLayersBelow = true;

View File

@ -667,7 +667,7 @@ public:
* -moz-win-exclude-glass style. Used in setting glass margins on
* Windows.
*/
void AddExcludedGlassRegion(const nsRegion& bounds) {
void AddExcludedGlassRegion(nsRect &bounds) {
mExcludedGlassRegion.Or(mExcludedGlassRegion, bounds);
}
const nsRegion& GetExcludedGlassRegion() {
@ -684,10 +684,6 @@ public:
mGlassDisplayItem = aItem;
}
}
// Call this only after we've finished building the display list
bool HasGlass() {
return mGlassDisplayItem != nullptr;
}
bool NeedToForceTransparentSurfaceForItem(nsDisplayItem* aItem) {
return aItem == mGlassDisplayItem;
}