wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 570620, part a: Fix an assertion that will soon no longer hold and remove obsoleted already_AddRefed idiom in two places. r=roc

Browse Source
This commit is contained in:
Chris Jones 2010-08-05 17:11:23 -05:00
parent 0b5df24742
commit 3b7ff8f6bc
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/FrameLayerBuilder.cpp
View File

@ -468,9 +468,6 @@ FrameLayerBuilder::UpdateDisplayItemDataForFrame(nsPtrHashKey<nsIFrame>* aEntry,
if (!newDisplayItems->HasContainerLayer()) {
props.Delete(ThebesLayerInvalidRegionProperty());
f->RemoveStateBits(NS_FRAME_HAS_CONTAINER_LAYER);
} else {
NS_ASSERTION(f->GetStateBits() & NS_FRAME_HAS_CONTAINER_LAYER,
"This bit should have been set by BuildContainerLayerFor");
}
// Reset the invalid region now so we can start collecting new dirty
@ -1225,8 +1222,7 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
state.Finish();
containerLayer->SetIsOpaqueContent(aChildren.IsOpaque());
nsRefPtr<Layer> layer = containerLayer.forget();
return layer.forget();
return containerLayer.forget();
}
Layer*

3
layout/generic/nsHTMLCanvasFrame.cpp
View File

@ -269,8 +269,7 @@ nsHTMLCanvasFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
layer->SetTransform(gfx3DMatrix::From2D(transform));
layer->SetFilter(nsLayoutUtils::GetGraphicsFilterForFrame(this));
nsRefPtr<Layer> result = layer.forget();
return result.forget();
return layer.forget();
}
NS_IMETHODIMP