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

layout/base/FrameLayerBuilder.cpp

@@ -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 containerLayer.forget();
-  return layer.forget();
 }
 
 Layer*

layout/generic/nsHTMLCanvasFrame.cpp

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