зеркало из https://github.com/mozilla/pjs.git
Use |this| instead of getting the frame from the reflow state, since the frame from the reflow state is wrong when we're in a XUL textbox. b=263806 Patch from Hideo Saito <saito@densan.co.jp>. r=bernd sr=dbaron
This commit is contained in:
Родитель
9e68805072
Коммит
7150424d2e
|
@ -1599,7 +1599,7 @@ nsTextControlFrame::CalculateSizeStandard(nsPresContext* aPresContext,
|
|||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
nsIRenderingContext* rendContext = aReflowState.rendContext;
|
||||
rendContext->SetFont(fontMet);
|
||||
lineHeight = aReflowState.CalcLineHeight(aPresContext, rendContext, aReflowState.frame);
|
||||
lineHeight = aReflowState.CalcLineHeight(aPresContext, rendContext, this);
|
||||
fontMet->GetAveCharWidth(charWidth);
|
||||
fontMet->GetMaxAdvance(charMaxAdvance);
|
||||
|
||||
|
|
|
@ -1599,7 +1599,7 @@ nsTextControlFrame::CalculateSizeStandard(nsPresContext* aPresContext,
|
|||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
nsIRenderingContext* rendContext = aReflowState.rendContext;
|
||||
rendContext->SetFont(fontMet);
|
||||
lineHeight = aReflowState.CalcLineHeight(aPresContext, rendContext, aReflowState.frame);
|
||||
lineHeight = aReflowState.CalcLineHeight(aPresContext, rendContext, this);
|
||||
fontMet->GetAveCharWidth(charWidth);
|
||||
fontMet->GetMaxAdvance(charMaxAdvance);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче