corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1317168 part 1 - nsTextControlFrame::CalcIntrinsicSize is infallible so make it return the size result rather than NS_OK. Also, make it const. r=dholbert

Browse Source
This commit is contained in:
Mats Palmgren
2016-11-18 19:08:32 +01:00
parent 5253fb6aeb
commit 1073e270eb
2 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
layout/forms/nsTextControlFrame.h
View File

@@ -188,9 +188,9 @@ public: //for methods who access nsTextControlFrame directly
DEFINE_TEXTCTRL_CONST_FORWARDER(bool, IsTextArea)
DEFINE_TEXTCTRL_CONST_FORWARDER(bool, IsPlainTextControl)
DEFINE_TEXTCTRL_CONST_FORWARDER(bool, IsPasswordTextControl)
DEFINE_TEXTCTRL_FORWARDER(int32_t, GetCols)
DEFINE_TEXTCTRL_FORWARDER(int32_t, GetWrapCols)
DEFINE_TEXTCTRL_FORWARDER(int32_t, GetRows)
DEFINE_TEXTCTRL_CONST_FORWARDER(int32_t, GetCols)
DEFINE_TEXTCTRL_CONST_FORWARDER(int32_t, GetWrapCols)
DEFINE_TEXTCTRL_CONST_FORWARDER(int32_t, GetRows)
#undef DEFINE_TEXTCTRL_CONST_FORWARDER
#undef DEFINE_TEXTCTRL_FORWARDER
@@ -274,10 +274,9 @@ protected:
// Compute our intrinsic size. This does not include any borders, paddings,
// etc. Just the size of our actual area for the text (and the scrollbars,
// for <textarea>).
nsresult CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
mozilla::WritingMode aWM,
mozilla::LogicalSize& aIntrinsicSize,
float aFontSizeInflation);
mozilla::LogicalSize CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
mozilla::WritingMode aWM,
float aFontSizeInflation) const;
nsresult ScrollSelectionIntoView() override;