Bug 1300369 part 9 - Add a ComputeSizeFlags param to nsFrame::ComputeSizeWithIntrinsicDimensions (idempotent patch). r=dholbert

layout/generic/nsFrame.cpp

@@ -4864,7 +4864,8 @@ nsFrame::ComputeSizeWithIntrinsicDimensions(nsRenderingContext*  aRenderingConte
                                             const LogicalSize&   aCBSize,
                                             const LogicalSize&   aMargin,
                                             const LogicalSize&   aBorder,
-                                            const LogicalSize&   aPadding)
+                                            const LogicalSize&   aPadding,
+                                            ComputeSizeFlags     aFlags)
 {
   const nsStylePosition* stylePos = StylePosition();
   const nsStyleCoord* inlineStyleCoord = &stylePos->ISize(aWM);

layout/generic/nsFrame.h

@@ -288,7 +288,8 @@ public:
               const mozilla::LogicalSize&   aCBSize,
               const mozilla::LogicalSize&   aMargin,
               const mozilla::LogicalSize&   aBorder,
-              const mozilla::LogicalSize&   aPadding);
+              const mozilla::LogicalSize&   aPadding,
+              ComputeSizeFlags              aFlags);
 
   // Compute tight bounds assuming this frame honours its border, background
   // and outline, its children's tight bounds, and nothing else.

layout/generic/nsHTMLCanvasFrame.cpp

@@ -238,7 +238,8 @@ nsHTMLCanvasFrame::ComputeSize(nsRenderingContext *aRenderingContext,
 
   return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
                                             intrinsicSize, intrinsicRatio,
-                                            aCBSize, aMargin, aBorder, aPadding);
+                                            aCBSize, aMargin, aBorder, aPadding,
+                                            aFlags);
 }
 
 void

layout/generic/nsImageFrame.cpp

@@ -872,7 +872,8 @@ nsImageFrame::ComputeSize(nsRenderingContext *aRenderingContext,
 
   return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
                                             intrinsicSize, mIntrinsicRatio,
-                                            aCBSize, aMargin, aBorder, aPadding);
+                                            aCBSize, aMargin, aBorder, aPadding,
+                                            aFlags);
 }
 
 // XXXdholbert This function's clients should probably just be calling

layout/generic/nsSubDocumentFrame.cpp

@@ -721,7 +721,7 @@ nsSubDocumentFrame::ComputeSize(nsRenderingContext* aRenderingContext,
                                               subDocRoot->GetIntrinsicSize(),
                                               subDocRoot->GetIntrinsicRatio(),
                                               aCBSize, aMargin, aBorder,
-                                              aPadding);
+                                              aPadding, aFlags);
   }
   return nsAtomicContainerFrame::ComputeSize(aRenderingContext, aWM,
                                              aCBSize, aAvailableISize,

layout/generic/nsVideoFrame.cpp

@@ -537,7 +537,8 @@ nsVideoFrame::ComputeSize(nsRenderingContext *aRenderingContext,
 
   return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
                                             intrinsicSize, intrinsicRatio,
-                                            aCBSize, aMargin, aBorder, aPadding);
+                                            aCBSize, aMargin, aBorder, aPadding,
+                                            aFlags);
 }
 
 nscoord nsVideoFrame::GetMinISize(nsRenderingContext *aRenderingContext)

layout/svg/nsSVGOuterSVGFrame.cpp

@@ -349,7 +349,8 @@ nsSVGOuterSVGFrame::ComputeSize(nsRenderingContext *aRenderingContext,
 
   return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
                                             intrinsicSize, GetIntrinsicRatio(),
-                                            cbSize, aMargin, aBorder, aPadding);
+                                            cbSize, aMargin, aBorder, aPadding,
+                                            aFlags);
 }
 
 void