mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 543563, fix build error due to conflict with bug 544472
This commit is contained in:
parent
d684032e5d
commit
0c4cd862d6
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user