Bug 795899 - Remove merged frame handling in BuildContainerLayerFor. r=roc

This commit is contained in:
Matt Woodrow 2012-10-03 13:03:34 +13:00
parent 311ea44e6b
commit 6e2109b0c9

View File

@ -2837,20 +2837,6 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
data->AddFrame(aContainerFrame);
entry->mContainerLayerGeneration = mContainerLayerGeneration;
}
nsAutoTArray<nsIFrame*,4> mergedFrames;
if (aContainerItem) {
aContainerItem->GetMergedFrames(&mergedFrames);
}
for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
nsIFrame* mergedFrame = mergedFrames[i];
entry = mNewDisplayItemData.PutEntry(mergedFrame);
if (entry) {
entry->mContainerLayerGeneration = mContainerLayerGeneration;
entry->mData.AppendElement(data);
data->AddFrame(mergedFrame);
}
}
}
nsRect bounds;