Bug 328926. Remove aPresContext from nsIFrame::Init and nsIFrame::DidSetStyleContext. r+sr=roc, patch by Marc Liddell
git-svn-id: svn://10.0.0.236/trunk@192085 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -265,14 +265,12 @@ nsImageFrame::Destroy(nsPresContext* aPresContext)
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsImageFrame::Init(nsPresContext* aPresContext,
|
||||
nsIContent* aContent,
|
||||
nsImageFrame::Init(nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsStyleContext* aContext,
|
||||
nsIFrame* aPrevInFlow)
|
||||
{
|
||||
nsresult rv = nsSplittableFrame::Init(aPresContext, aContent, aParent,
|
||||
aContext, aPrevInFlow);
|
||||
nsresult rv = nsSplittableFrame::Init(aContent, aParent, aContext, aPrevInFlow);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
mListener = new nsImageListener(this);
|
||||
@@ -282,6 +280,8 @@ nsImageFrame::Init(nsPresContext* aPresContext,
|
||||
NS_ENSURE_TRUE(imageLoader, NS_ERROR_UNEXPECTED);
|
||||
imageLoader->AddObserver(mListener);
|
||||
|
||||
nsPresContext *aPresContext = GetPresContext();
|
||||
|
||||
if (!gIconLoad)
|
||||
LoadIcons(aPresContext);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user