Changeset 286118 in webkit

Timestamp:

Nov 22, 2021, 12:42:11 PM (5 years ago)

Author:

Fujii Hironori

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&".

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-22  Fujii Hironori  <Hironori.Fujii@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  <jya@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2257 +2257 @@
 
     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()))

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3114 +3114 @@
         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