Changeset 278300 in webkit

Timestamp:

Jun 1, 2021, 3:52:26 AM (5 years ago)

Author:

svillar@igalia.com

Message:

Improve if condition in RenderReplaced::computeReplacedLogicalWidth
​https://bugs.webkit.org/show_bug.cgi?id=226325

Reviewed by Darin Adler.

Removed the check for intrinsicRatio as we're already inside a block in which intrinsicRatio
is true. Also switched the position of the two conditions in the OR clause as it allows us
to remove the check for computedHeightIsAuto. Last but not least, used a ternary operator
to initialize the value of boxSizing instead of the if clause.

No new tests as there is no change in functionality.

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computeReplacedLogicalWidth const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-27  Sergio Villar Senin  <svillar@igalia.com>
+
+        Improve if condition in RenderReplaced::computeReplacedLogicalWidth
+        https://bugs.webkit.org/show_bug.cgi?id=226325
+
+        Reviewed by Darin Adler.
+
+        Removed the check for intrinsicRatio as we're already inside a block in which intrinsicRatio
+        is true. Also switched the position of the two conditions in the OR clause as it allows us
+        to remove the check for computedHeightIsAuto. Last but not least, used a ternary operator
+        to initialize the value of boxSizing instead of the if clause.
+
+        No new tests as there is no change in functionality.
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computeReplacedLogicalWidth const):
+
 2021-05-31  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -562 +562 @@
             // or if 'width' has a computed value of 'auto', 'height' has some other computed value, and the element does have an intrinsic ratio; then the used value
             // of 'width' is: (used height) * (intrinsic ratio)
-            if (intrinsicRatio && ((computedHeightIsAuto && !hasIntrinsicWidth && hasIntrinsicHeight) || !computedHeightIsAuto)) {
+            if (!computedHeightIsAuto || (!hasIntrinsicWidth && hasIntrinsicHeight)) {
                 LayoutUnit estimatedUsedWidth = hasIntrinsicWidth ? LayoutUnit(constrainedSize.width()) : computeConstrainedLogicalWidth(shouldComputePreferred);
                 LayoutUnit logicalHeight = computeReplacedLogicalHeight(std::optional<LayoutUnit>(estimatedUsedWidth));
-                BoxSizing boxSizing = BoxSizing::ContentBox;
-                if (style().hasAspectRatio())
-                    boxSizing = style().boxSizingForAspectRatio();
+                BoxSizing boxSizing = style().hasAspectRatio() ? style().boxSizingForAspectRatio() : BoxSizing::ContentBox;
                 return computeReplacedLogicalWidthRespectingMinMaxWidth(resolveWidthForRatio(borderAndPaddingLogicalHeight(), borderAndPaddingLogicalWidth(), logicalHeight, intrinsicRatio, boxSizing), shouldComputePreferred);
             }
 
-            
             // If 'height' and 'width' both have computed values of 'auto' and the
             // element has an intrinsic ratio but no intrinsic height or width, then