Bug 543563, fix build error due to conflict with bug 544472

This commit is contained in:
Neil Deakin 2010-03-18 16:45:29 -04:00
parent d684032e5d
commit 0c4cd862d6

View File

@ -1760,7 +1760,8 @@ nsTextControlFrame::GetPrefSize(nsBoxLayoutState& aState)
NS_ENSURE_SUCCESS(rv, pref);
AddBorderAndPadding(pref);
nsIBox::AddCSSPrefSize(aState, this, pref);
PRBool widthSet, heightSet;
nsIBox::AddCSSPrefSize(this, pref, widthSet, heightSet);
nsSize minSize = GetMinSize(aState);
nsSize maxSize = GetMaxSize(aState);