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

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

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix additional test 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/LayoutTable.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTable.cpp b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
index 1fd05ec5287a700b9612cf03b69bed5c9ed07ddc..ae3e5c0d4391dc2582f8f17f34240e74cad2ecce 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTable.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
@@ -298,7 +298,7 @@ void LayoutTable::updateLogicalWidth()
// Ensure we aren't smaller than our min preferred width. This MUST be done after 'max-width' as
// we ignore it if it means we wouldn't accommodate our content.
- setLogicalWidth(std::max(logicalWidth(), minPreferredLogicalWidth()).floor());
+ setLogicalWidth(LayoutUnit(std::max(logicalWidth(), minPreferredLogicalWidth()).floor()));
// Ensure we aren't smaller than our min-width style.
Length styleMinLogicalWidth = style()->logicalMinWidth();
@@ -348,7 +348,7 @@ LayoutUnit LayoutTable::convertStyleLogicalHeightToComputedHeight(const Length&
if (isHTMLTableElement(node()) || style()->boxSizing() == BORDER_BOX) {
borders = borderAndPadding;
}
- computedLogicalHeight = styleLogicalHeight.value() - borders;
+ computedLogicalHeight = LayoutUnit(styleLogicalHeight.value() - borders);
} else if (styleLogicalHeight.hasPercent()) {
computedLogicalHeight = computePercentageLogicalHeight(styleLogicalHeight);
} else if (styleLogicalHeight.isIntrinsic()) {

Powered by Google App Engine
This is Rietveld 408576698