Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1653673002: Even more explicit LayoutUnit conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moarConstructors
Patch Set: address comments Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index f70340ee41bd9d28ceaaf5d2eb9e4b8f57c693e9..b2e804d8d797b6b21c0b10a64d955d36b2e36a00 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2136,8 +2136,8 @@ void LayoutBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)
LayoutUnit LayoutBox::fillAvailableMeasure(LayoutUnit availableLogicalWidth) const
{
- LayoutUnit marginStart = 0;
- LayoutUnit marginEnd = 0;
+ LayoutUnit marginStart;
+ LayoutUnit marginEnd;
return fillAvailableMeasure(availableLogicalWidth, marginStart, marginEnd);
}
@@ -2156,8 +2156,8 @@ LayoutUnit LayoutBox::computeIntrinsicLogicalWidthUsing(const Length& logicalWid
if (logicalWidthLength.type() == FillAvailable)
return fillAvailableMeasure(availableLogicalWidth);
- LayoutUnit minLogicalWidth = 0;
- LayoutUnit maxLogicalWidth = 0;
+ LayoutUnit minLogicalWidth;
+ LayoutUnit maxLogicalWidth;
computeIntrinsicLogicalWidths(minLogicalWidth, maxLogicalWidth);
if (logicalWidthLength.type() == MinContent)
@@ -2190,8 +2190,8 @@ LayoutUnit LayoutBox::computeLogicalWidthUsing(SizeType widthType, const Length&
if (logicalWidth.isIntrinsic())
return computeIntrinsicLogicalWidthUsing(logicalWidth, availableLogicalWidth, borderAndPaddingLogicalWidth());
- LayoutUnit marginStart = 0;
- LayoutUnit marginEnd = 0;
+ LayoutUnit marginStart;
+ LayoutUnit marginEnd;
LayoutUnit logicalWidthResult = fillAvailableMeasure(availableLogicalWidth, marginStart, marginEnd);
if (shrinkToAvoidFloats() && cb->isLayoutBlockFlow() && toLayoutBlockFlow(cb)->containsFloats())
@@ -2583,7 +2583,7 @@ LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const
bool skippedAutoHeightContainingBlock = false;
LayoutBlock* cb = containingBlock();
const LayoutBox* containingBlockChild = this;
- LayoutUnit rootMarginBorderPaddingHeight = 0;
+ LayoutUnit rootMarginBorderPaddingHeight;
while (!cb->isLayoutView() && skipContainingBlockForPercentHeightCalculation(cb)) {
if (cb->isBody() || cb->isDocumentElement())
rootMarginBorderPaddingHeight += cb->marginBefore() + cb->marginAfter() + cb->borderAndPaddingLogicalHeight();
@@ -2699,7 +2699,7 @@ LayoutUnit LayoutBox::computeReplacedLogicalWidthUsing(SizeType sizeType, const
case MinContent:
case MaxContent: {
// MinContent/MaxContent don't need the availableLogicalWidth argument.
- LayoutUnit availableLogicalWidth = 0;
+ LayoutUnit availableLogicalWidth;
return computeIntrinsicLogicalWidthUsing(logicalWidth, availableLogicalWidth, borderAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth();
}
case FitContent:
@@ -3484,7 +3484,7 @@ void LayoutBox::computePositionedLogicalHeightUsing(SizeType heightSizeType, Len
const LayoutUnit containerRelativeLogicalWidth = containingBlockLogicalWidthForPositioned(containerBlock, false);
- LayoutUnit logicalTopValue = 0;
+ LayoutUnit logicalTopValue;
bool logicalHeightIsAuto = logicalHeightLength.isAuto();
bool logicalTopIsAuto = logicalTop.isAuto();

Powered by Google App Engine
This is Rietveld 408576698