Commit ff5d92f4 authored by Ting-Yu Lin's avatar Ting-Yu Lin
Browse files

Bug 1168478 Part 1 - Combine the border and padding argument for... 

Bug 1168478 Part 1 - Combine the border and padding argument for nsIFrame::ComputeAutoSize(). r=dholbert

Also, revise the nsIFrame::ComputeAutoSize()'s documentation.

This change shouldn't change behavior.

Differential Revision: https://phabricator.services.mozilla.com/D90063
parent 3c663bd2

layout/forms/nsCheckboxRadioFrame.cpp

+2 −3
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ nscoord nsCheckboxRadioFrame::GetPrefISize(gfxContext* aRenderingContext) { 
LogicalSize nsCheckboxRadioFrame::ComputeAutoSize(

    gfxContext* aRC, WritingMode aWM, const LogicalSize& aCBSize,

    nscoord aAvailableISize, const LogicalSize& aMargin,

    const LogicalSize& aBorder, const LogicalSize& aPadding,

    ComputeSizeFlags aFlags) {

    const LogicalSize& aBorderPadding, ComputeSizeFlags aFlags) {

  LogicalSize size(aWM, 0, 0);

  if (!StyleDisplay()->HasAppearance()) {

    return size;
@@ -76,7 +75,7 @@ LogicalSize nsCheckboxRadioFrame::ComputeAutoSize( 


  // Note: this call always set the BSize to NS_UNCONSTRAINEDSIZE.

  size = nsAtomicContainerFrame::ComputeAutoSize(

      aRC, aWM, aCBSize, aAvailableISize, aMargin, aBorder, aPadding, aFlags);

      aRC, aWM, aCBSize, aAvailableISize, aMargin, aBorderPadding, aFlags);

  size.BSize(aWM) = DefaultSize();

  return size;

}

layout/forms/nsCheckboxRadioFrame.h

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ class nsCheckboxRadioFrame final : public nsAtomicContainerFrame, 
  virtual mozilla::LogicalSize ComputeAutoSize(

      gfxContext* aRenderingContext, mozilla::WritingMode aWM,

      const mozilla::LogicalSize& aCBSize, nscoord aAvailableISize,

      const mozilla::LogicalSize& aMargin, const mozilla::LogicalSize& aBorder,

      const mozilla::LogicalSize& aPadding,

      const mozilla::LogicalSize& aMargin,

      const mozilla::LogicalSize& aBorderPadding,

      mozilla::ComputeSizeFlags aFlags) override;



  /**

layout/forms/nsMeterFrame.cpp

+1 −2
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ nsresult nsMeterFrame::AttributeChanged(int32_t aNameSpaceID, 
LogicalSize nsMeterFrame::ComputeAutoSize(

    gfxContext* aRenderingContext, WritingMode aWM, const LogicalSize& aCBSize,

    nscoord aAvailableISize, const LogicalSize& aMargin,

    const LogicalSize& aBorder, const LogicalSize& aPadding,

    ComputeSizeFlags aFlags) {

    const LogicalSize& aBorderPadding, ComputeSizeFlags aFlags) {

  RefPtr<nsFontMetrics> fontMet =

      nsLayoutUtils::GetFontMetricsForFrame(this, 1.0f);

layout/forms/nsMeterFrame.h

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ class nsMeterFrame final : public nsContainerFrame, 
  virtual mozilla::LogicalSize ComputeAutoSize(

      gfxContext* aRenderingContext, mozilla::WritingMode aWM,

      const mozilla::LogicalSize& aCBSize, nscoord aAvailableISize,

      const mozilla::LogicalSize& aMargin, const mozilla::LogicalSize& aBorder,

      const mozilla::LogicalSize& aPadding,

      const mozilla::LogicalSize& aMargin,

      const mozilla::LogicalSize& aBorderPadding,

      mozilla::ComputeSizeFlags aFlags) override;



  virtual nscoord GetMinISize(gfxContext* aRenderingContext) override;

layout/forms/nsProgressFrame.cpp

+1 −2
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ nsresult nsProgressFrame::AttributeChanged(int32_t aNameSpaceID, 
LogicalSize nsProgressFrame::ComputeAutoSize(

    gfxContext* aRenderingContext, WritingMode aWM, const LogicalSize& aCBSize,

    nscoord aAvailableISize, const LogicalSize& aMargin,

    const LogicalSize& aBorder, const LogicalSize& aPadding,

    ComputeSizeFlags aFlags) {

    const LogicalSize& aBorderPadding, ComputeSizeFlags aFlags) {

  const WritingMode wm = GetWritingMode();

  LogicalSize autoSize(wm);

  autoSize.BSize(wm) = autoSize.ISize(wm) =