Commit dc01df27 authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

Bug 1825709 - Misc clean-ups in nsTextControlFrame. r=dshin 

Use inline initializers etc.

Differential Revision: https://phabricator.services.mozilla.com/D175744
parent 2fea175b

layout/forms/nsTextControlFrame.cpp

+5 −20
Original line number Diff line number Diff line
@@ -115,17 +115,7 @@ class nsTextControlFrame::nsAnonDivObserver final 
nsTextControlFrame::nsTextControlFrame(ComputedStyle* aStyle,

                                       nsPresContext* aPresContext,

                                       nsIFrame::ClassID aClassID)

    : nsContainerFrame(aStyle, aPresContext, aClassID),

      mFirstBaseline(NS_INTRINSIC_ISIZE_UNKNOWN),

      mEditorHasBeenInitialized(false),

      mIsProcessing(false)

#ifdef DEBUG

      ,

      mInEditorInitialization(false)

#endif

{

  ClearCachedValue();

}

    : nsContainerFrame(aStyle, aPresContext, aClassID) {}



nsTextControlFrame::~nsTextControlFrame() = default;
@@ -188,19 +178,14 @@ LogicalSize nsTextControlFrame::CalcIntrinsicSize( 
    gfxContext* aRenderingContext, WritingMode aWM,

    float aFontSizeInflation) const {

  LogicalSize intrinsicSize(aWM);

  // Get leading and the Average/MaxAdvance char width

  nscoord lineHeight = 0;

  nscoord charWidth = 0;

  nscoord charMaxAdvance = 0;



  RefPtr<nsFontMetrics> fontMet =

      nsLayoutUtils::GetFontMetricsForFrame(this, aFontSizeInflation);



  lineHeight =

  nscoord lineHeight =

      ReflowInput::CalcLineHeight(*Style(), PresContext(), GetContent(),

                                  NS_UNCONSTRAINEDSIZE, aFontSizeInflation);

  charWidth = fontMet->AveCharWidth();

  charMaxAdvance = fontMet->MaxAdvance();

  // Get leading and the Average/MaxAdvance char width

  nscoord charWidth = fontMet->AveCharWidth();

  nscoord charMaxAdvance = fontMet->MaxAdvance();



  // Set the width equal to the width in characters

  int32_t cols = GetCols();

layout/forms/nsTextControlFrame.h

+5 −5
Original line number Diff line number Diff line
@@ -354,19 +354,19 @@ class nsTextControlFrame : public nsContainerFrame, 
  // is modified, this is cleared.

  //

  // FIXME(bug 1402545): Consider using an nsAutoString here.

  nsString mCachedValue;

  nsString mCachedValue{VoidString()};



  // Our first baseline, or NS_INTRINSIC_ISIZE_UNKNOWN if we have a pending

  // Reflow (or if we're contain:layout, which means we have no baseline).

  nscoord mFirstBaseline;

  nscoord mFirstBaseline = NS_INTRINSIC_ISIZE_UNKNOWN;



  // these packed bools could instead use the high order bits on mState, saving

  // 4 bytes

  bool mEditorHasBeenInitialized;

  bool mIsProcessing;

  bool mEditorHasBeenInitialized = false;

  bool mIsProcessing = false;



#ifdef DEBUG

  bool mInEditorInitialization;

  bool mInEditorInitialization = false;

  friend class EditorInitializerEntryTracker;

#endif

};