merge m-c to devtools, fix bustage

This commit is contained in:
Rob Campbell 2011-05-09 11:51:20 -03:00
commit f64f52bb9c
2 changed files with 2 additions and 2 deletions

View File

@ -107,7 +107,7 @@ nsProgressFrame::DestroyFrom(nsIFrame* aDestructRoot)
}
nsresult
nsProgressFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
nsProgressFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
{
// Get the NodeInfoManager and tag necessary to create the progress bar div.
nsCOMPtr<nsIDocument> doc = mContent->GetDocument();

View File

@ -73,7 +73,7 @@ public:
virtual PRBool IsLeaf() const { return PR_TRUE; }
// nsIAnonymousContentCreator
virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
PRUint32 aFilter);