Title: [286118] trunk/Source/WebCore
Revision
286118
Author
hironori.fu...@sony.com
Date
2021-11-22 12:42:11 -0800 (Mon, 22 Nov 2021)

Log Message

[MSVC] RenderBlock.cpp(2259): warning C4239: nonstandard extension used: 'initializing': conversion from 'WebCore::Length' to 'WebCore::Length &'
https://bugs.webkit.org/show_bug.cgi?id=233412

Reviewed by Don Olmstead.

WinCairo build reported the following warnings.

> Source\WebCore\rendering/RenderBlock.cpp(2259): warning C4239: nonstandard extension used: 'initializing': conversion from 'WebCore::Length' to 'WebCore::Length &'
> Source\WebCore\rendering/RenderBlock.cpp(2259): note: A non-const reference may only be bound to an lvalue
> Source\WebCore\rendering/RenderBox.cpp(3116): warning C4239: nonstandard extension used: 'initializing': conversion from 'WebCore::Length' to 'WebCore::Length &'
> Source\WebCore\rendering/RenderBox.cpp(3116): note: A non-const reference may only be bound to an lvalue

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computePreferredLogicalWidths):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalHeight const):
Changed "auto&" to "const auto&".

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (286117 => 286118)


--- trunk/Source/WebCore/ChangeLog	2021-11-22 20:35:05 UTC (rev 286117)
+++ trunk/Source/WebCore/ChangeLog	2021-11-22 20:42:11 UTC (rev 286118)
@@ -1,3 +1,23 @@
+2021-11-22  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [MSVC] RenderBlock.cpp(2259): warning C4239: nonstandard extension used: 'initializing': conversion from 'WebCore::Length' to 'WebCore::Length &'
+        https://bugs.webkit.org/show_bug.cgi?id=233412
+
+        Reviewed by Don Olmstead.
+
+        WinCairo build reported the following warnings.
+
+        > Source\WebCore\rendering/RenderBlock.cpp(2259): warning C4239: nonstandard extension used: 'initializing': conversion from 'WebCore::Length' to 'WebCore::Length &'
+        > Source\WebCore\rendering/RenderBlock.cpp(2259): note: A non-const reference may only be bound to an lvalue
+        > Source\WebCore\rendering/RenderBox.cpp(3116): warning C4239: nonstandard extension used: 'initializing': conversion from 'WebCore::Length' to 'WebCore::Length &'
+        > Source\WebCore\rendering/RenderBox.cpp(3116): note: A non-const reference may only be bound to an lvalue
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computePreferredLogicalWidths):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalHeight const):
+        Changed "auto&" to "const auto&".
+
 2021-11-22  Jean-Yves Avenard  <j...@apple.com>
 
         Remove unused getEOTHeader method in OpenTypeUtilities.cpp

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (286117 => 286118)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2021-11-22 20:35:05 UTC (rev 286117)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2021-11-22 20:42:11 UTC (rev 286118)
@@ -2256,7 +2256,7 @@
     m_maxPreferredLogicalWidth = 0;
 
     const RenderStyle& styleToUse = style();
-    auto& lengthToUse = hasOverridingLogicalWidthLength() ? overridingLogicalWidthLength() : styleToUse.logicalWidth();
+    const auto& lengthToUse = hasOverridingLogicalWidthLength() ? overridingLogicalWidthLength() : styleToUse.logicalWidth();
     if (!isTableCell() && lengthToUse.isFixed() && lengthToUse.value() >= 0
         && !(isDeprecatedFlexItem() && !lengthToUse.intValue()))
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = adjustContentBoxLogicalWidthForBoxSizing(lengthToUse);

Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (286117 => 286118)


--- trunk/Source/WebCore/rendering/RenderBox.cpp	2021-11-22 20:35:05 UTC (rev 286117)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp	2021-11-22 20:42:11 UTC (rev 286118)
@@ -3113,7 +3113,7 @@
         bool stretching = parent()->style().boxAlign() == BoxAlignment::Stretch;
         bool treatAsReplaced = shouldComputeSizeAsReplaced() && (!inHorizontalBox || !stretching);
         bool checkMinMaxHeight = false;
-        auto& logicalHeightInUse = hasOverridingLogicalHeightLength() ? overridingLogicalHeightLength() : style().logicalHeight();
+        const auto& logicalHeightInUse = hasOverridingLogicalHeightLength() ? overridingLogicalHeightLength() : style().logicalHeight();
 
         // The parent box is flexing us, so it has increased or decreased our height.  We have to
         // grab our cached flexible height.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to