@@ -2671,43 +2671,6 @@ class nsIFrame : public nsQueryFrame {
2671
2671
*/
2672
2672
virtual mozilla::AspectRatio GetIntrinsicRatio ();
2673
2673
2674
- /* *
2675
- * Bit-flags to pass to ComputeSize in |aFlags| parameter.
2676
- */
2677
- enum class ComputeSizeFlag : uint8_t {
2678
- /* *
2679
- * Set if the frame is in a context where non-replaced blocks should
2680
- * shrink-wrap (e.g., it's floating, absolutely positioned, or
2681
- * inline-block).
2682
- */
2683
- ShrinkWrap,
2684
-
2685
- /* *
2686
- * Set if we'd like to compute our 'auto' bsize, regardless of our actual
2687
- * corresponding computed value. (e.g. to get an intrinsic height for flex
2688
- * items with "min-height: auto" to use during flexbox layout.)
2689
- */
2690
- UseAutoBSize,
2691
-
2692
- /* *
2693
- * Indicates that we should clamp the margin-box min-size to the given CB
2694
- * size. This is used for implementing the grid area clamping here:
2695
- * https://drafts.csswg.org/css-grid/#min-size-auto
2696
- */
2697
- IClampMarginBoxMinSize, // clamp in our inline axis
2698
- BClampMarginBoxMinSize, // clamp in our block axis
2699
-
2700
- /* *
2701
- * The frame is stretching (per CSS Box Alignment) and doesn't have an
2702
- * Automatic Minimum Size in the indicated axis.
2703
- * (may be used for both flex/grid items, but currently only used for Grid)
2704
- * https://drafts.csswg.org/css-grid/#min-size-auto
2705
- * https://drafts.csswg.org/css-align-3/#valdef-justify-self-stretch
2706
- */
2707
- IApplyAutoMinSize, // only has an effect when eShrinkWrap is false
2708
- };
2709
- using ComputeSizeFlags = mozilla::EnumSet<ComputeSizeFlag>;
2710
-
2711
2674
/* *
2712
2675
* Compute the size that a frame will occupy. Called while
2713
2676
* constructing the ReflowInput to be used to Reflow the frame,
@@ -2746,7 +2709,8 @@ class nsIFrame : public nsQueryFrame {
2746
2709
* @param aPadding The sum of the vertical / horizontal margins of
2747
2710
* the frame, including actual values resulting from
2748
2711
* percentages.
2749
- * @param aFlags Flags to further customize behavior (definitions above).
2712
+ * @param aFlags Flags to further customize behavior (definitions in
2713
+ * LayoutConstants.h).
2750
2714
*
2751
2715
* The return value includes the computed LogicalSize and the enum class which
2752
2716
* indicates whether the inline/block size is affected by aspect-ratio or not.
@@ -2767,7 +2731,7 @@ class nsIFrame : public nsQueryFrame {
2767
2731
gfxContext* aRenderingContext, mozilla::WritingMode aWM,
2768
2732
const mozilla::LogicalSize& aCBSize, nscoord aAvailableISize,
2769
2733
const mozilla::LogicalSize& aMargin, const mozilla::LogicalSize& aBorder,
2770
- const mozilla::LogicalSize& aPadding, ComputeSizeFlags aFlags);
2734
+ const mozilla::LogicalSize& aPadding, mozilla:: ComputeSizeFlags aFlags);
2771
2735
2772
2736
protected:
2773
2737
/* *
@@ -2789,14 +2753,14 @@ class nsIFrame : public nsQueryFrame {
2789
2753
gfxContext* aRenderingContext, mozilla::WritingMode aWM,
2790
2754
const mozilla::LogicalSize& aCBSize, nscoord aAvailableISize,
2791
2755
const mozilla::LogicalSize& aMargin, const mozilla::LogicalSize& aBorder,
2792
- const mozilla::LogicalSize& aPadding, ComputeSizeFlags aFlags);
2756
+ const mozilla::LogicalSize& aPadding, mozilla:: ComputeSizeFlags aFlags);
2793
2757
2794
2758
/* *
2795
2759
* Utility function for ComputeAutoSize implementations. Return
2796
2760
* max(GetMinISize(), min(aISizeInCB, GetPrefISize()))
2797
2761
*/
2798
2762
nscoord ShrinkWidthToFit (gfxContext* aRenderingContext, nscoord aISizeInCB,
2799
- ComputeSizeFlags aFlags);
2763
+ mozilla:: ComputeSizeFlags aFlags);
2800
2764
2801
2765
public:
2802
2766
/* *
@@ -4734,22 +4698,23 @@ class nsIFrame : public nsQueryFrame {
4734
4698
nscoord aContainingBlockISize,
4735
4699
nscoord aContentEdgeToBoxSizing,
4736
4700
nscoord aBoxSizingToMarginEdge,
4737
- StyleExtremumLength aSize, ComputeSizeFlags aFlags);
4701
+ StyleExtremumLength aSize,
4702
+ mozilla::ComputeSizeFlags aFlags);
4738
4703
4739
4704
nscoord ComputeISizeValue (gfxContext* aRenderingContext,
4740
4705
nscoord aContainingBlockISize,
4741
4706
nscoord aContentEdgeToBoxSizing,
4742
4707
nscoord aBoxSizingToMarginEdge,
4743
4708
const LengthPercentage& aSize,
4744
- ComputeSizeFlags aFlags);
4709
+ mozilla:: ComputeSizeFlags aFlags);
4745
4710
4746
4711
template <typename SizeOrMaxSize>
4747
4712
nscoord ComputeISizeValue (gfxContext* aRenderingContext,
4748
4713
nscoord aContainingBlockISize,
4749
4714
nscoord aContentEdgeToBoxSizing,
4750
4715
nscoord aBoxSizingToMarginEdge,
4751
4716
const SizeOrMaxSize& aSize,
4752
- ComputeSizeFlags aFlags = {}) {
4717
+ mozilla:: ComputeSizeFlags aFlags = {}) {
4753
4718
MOZ_ASSERT (aSize.IsExtremumLength () || aSize.IsLengthPercentage (),
4754
4719
" This doesn't handle auto / none" );
4755
4720
if (aSize.IsLengthPercentage ()) {
0 commit comments