Title: [271758] trunk/Source/WebCore
- Revision
- 271758
- Author
- [email protected]
- Date
- 2021-01-22 12:49:30 -0800 (Fri, 22 Jan 2021)
Log Message
Avoid duplicate calculations in RenderBlock::computePreferredLogicalWidths
https://bugs.webkit.org/show_bug.cgi?id=220873
Patch by Rob Buis <[email protected]> on 2021-01-22
Reviewed by Darin Adler.
Avoid duplicate calculations in RenderBlock::computePreferredLogicalWidths.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computePreferredLogicalWidths):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (271757 => 271758)
--- trunk/Source/WebCore/ChangeLog 2021-01-22 20:40:21 UTC (rev 271757)
+++ trunk/Source/WebCore/ChangeLog 2021-01-22 20:49:30 UTC (rev 271758)
@@ -1,3 +1,15 @@
+2021-01-22 Rob Buis <[email protected]>
+
+ Avoid duplicate calculations in RenderBlock::computePreferredLogicalWidths
+ https://bugs.webkit.org/show_bug.cgi?id=220873
+
+ Reviewed by Darin Adler.
+
+ Avoid duplicate calculations in RenderBlock::computePreferredLogicalWidths.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computePreferredLogicalWidths):
+
2021-01-21 Wenson Hsieh <[email protected]>
DisplayList::Replayer should stop replay and inform clients after encountering an invalid item
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (271757 => 271758)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2021-01-22 20:40:21 UTC (rev 271757)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2021-01-22 20:49:30 UTC (rev 271758)
@@ -2286,13 +2286,15 @@
computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
if (styleToUse.logicalMaxWidth().isFixed()) {
- m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
- m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth()));
+ auto adjustContentBoxLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMaxWidth());
+ m_maxPreferredLogicalWidth = std::min(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidth);
+ m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidth);
}
if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
- m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth()));
+ auto adjustContentBoxLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth());
+ m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidth);
+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidth);
}
LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
