diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /layout/forms/nsTextControlFrame.h | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/forms/nsTextControlFrame.h')
| -rw-r--r-- | layout/forms/nsTextControlFrame.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h index 0d52e5849f..2eb6f18d15 100644 --- a/layout/forms/nsTextControlFrame.h +++ b/layout/forms/nsTextControlFrame.h @@ -63,14 +63,6 @@ class nsTextControlFrame : public nsContainerFrame, nscoord GetMinISize(gfxContext* aRenderingContext) override; nscoord GetPrefISize(gfxContext* aRenderingContext) override; - mozilla::LogicalSize ComputeAutoSize( - gfxContext* aRenderingContext, mozilla::WritingMode aWM, - const mozilla::LogicalSize& aCBSize, nscoord aAvailableISize, - const mozilla::LogicalSize& aMargin, - const mozilla::LogicalSize& aBorderPadding, - const mozilla::StyleSizeOverrides& aSizeOverrides, - mozilla::ComputeSizeFlags aFlags) override; - void Reflow(nsPresContext* aPresContext, ReflowOutput& aDesiredSize, const ReflowInput& aReflowInput, nsReflowStatus& aStatus) override; @@ -180,10 +172,11 @@ class nsTextControlFrame : public nsContainerFrame, /** * Launch the reflow on the child frames - see nsTextControlFrame::Reflow() */ - void ReflowTextControlChild(nsIFrame* aFrame, nsPresContext* aPresContext, + void ReflowTextControlChild(nsIFrame* aKid, nsPresContext* aPresContext, const ReflowInput& aReflowInput, nsReflowStatus& aStatus, ReflowOutput& aParentDesiredSize, + const mozilla::LogicalSize& aParentContentBoxSize, nscoord& aButtonBoxISize); public: @@ -278,8 +271,7 @@ class nsTextControlFrame : public nsContainerFrame, // etc. Just the size of our actual area for the text (and the scrollbars, // for <textarea>). mozilla::LogicalSize CalcIntrinsicSize(gfxContext* aRenderingContext, - mozilla::WritingMode aWM, - float aFontSizeInflation) const; + mozilla::WritingMode aWM) const; private: // helper methods |