Issue #1619 - Nits Picked

layout/generic/nsFlexContainerFrame.cpp

@@ -1529,9 +1529,9 @@ MainSizeFromAspectRatio(nscoord aCrossSize,
 {
   MOZ_ASSERT(aIntrinsicRatio,
              "Invalid ratio; will divide by 0! Caller should've checked...");
-  AspectRatio ratio = aAxisTracker.IsMainAxisHorizontal()
-                          ? aIntrinsicRatio
-                          : aIntrinsicRatio.Inverted();
+  AspectRatio ratio = aAxisTracker.IsMainAxisHorizontal() ?
+                      aIntrinsicRatio :
+                      aIntrinsicRatio.Inverted();
 
   return ratio.ApplyTo(aCrossSize);
 }

layout/generic/nsHTMLCanvasFrame.cpp

@@ -199,6 +199,7 @@ nsHTMLCanvasFrame::GetIntrinsicSize()
 /* virtual */ AspectRatio
 nsHTMLCanvasFrame::GetIntrinsicRatio()
 {
+ // When 'contain: size' is implemented, make sure to check for it.
 /*
   if (StyleDisplay()->IsContainSize()) {
     return AspectRatio();

layout/generic/nsVideoFrame.cpp

@@ -531,9 +531,9 @@ nsVideoFrame::ComputeSize(nsRenderingContext *aRenderingContext,
   intrinsicSize.height.SetCoordValue(size.height);
 
   // Only video elements have an intrinsic ratio.
-  auto intrinsicRatio = HasVideoElement()
-                            ? AspectRatio::FromSize(size)
-                            : AspectRatio();
+  auto intrinsicRatio = HasVideoElement() ?
+                        AspectRatio::FromSize(size) :
+                        AspectRatio();
 
   return ComputeSizeWithIntrinsicDimensions(aRenderingContext, aWM,
                                             intrinsicSize, intrinsicRatio,

layout/xul/nsImageBoxFrame.cpp

@@ -407,8 +407,7 @@ nsImageBoxFrame::PaintImage(nsRenderingContext& aRenderingContext,
       // Image has a valid size; use it as intrinsic size & ratio.
       intrinsicSize.width.SetCoordValue(mIntrinsicSize.width);
       intrinsicSize.height.SetCoordValue(mIntrinsicSize.height);
-      intrinsicRatio =
-          AspectRatio::FromSize(mIntrinsicSize);
+      intrinsicRatio = AspectRatio::FromSize(mIntrinsicSize);
     } else {
       // Image doesn't have a (valid) intrinsic size.
       // Try to look up intrinsic ratio and use that at least.