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

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

Issue 1574933002: Changed type of border-width longhands from unsigned to float. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made transitions use fractional border widths, added assert that border widths are positive, and r… 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/LayoutTableCell.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
index 94c76ba8a4e36fcc60ee08915c909c07a4eebc60..aba4f34e1583916233498049605671c97eda7c35 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
@@ -321,11 +321,11 @@ LayoutRect LayoutTableCell::clippedOverflowRectForPaintInvalidation(const Layout
return LayoutBlockFlow::clippedOverflowRectForPaintInvalidation(paintInvalidationContainer, paintInvalidationState);
bool rtl = !styleForCellFlow().isLeftToRightDirection();
- int outlineOutset = style()->outlineOutsetExtent();
- int left = std::max(borderHalfLeft(true), outlineOutset);
- int right = std::max(borderHalfRight(true), outlineOutset);
- int top = std::max(borderHalfTop(true), outlineOutset);
- int bottom = std::max(borderHalfBottom(true), outlineOutset);
+ LayoutUnit outlineOutset = style()->outlineOutsetExtent();
+ LayoutUnit left = std::max(borderHalfLeft(true), outlineOutset);
+ LayoutUnit right = std::max(borderHalfRight(true), outlineOutset);
+ LayoutUnit top = std::max(borderHalfTop(true), outlineOutset);
+ LayoutUnit bottom = std::max(borderHalfBottom(true), outlineOutset);
if ((left && !rtl) || (right && rtl)) {
if (LayoutTableCell* before = table()->cellBefore(this)) {
top = std::max(top, before->borderHalfTop(true));
@@ -794,49 +794,49 @@ CollapsedBorderValue LayoutTableCell::computeCollapsedAfterBorder(IncludeBorderC
return result;
}
-int LayoutTableCell::borderLeft() const
+LayoutUnit LayoutTableCell::borderLeft() const
{
return table()->collapseBorders() ? borderHalfLeft(false) : LayoutBlockFlow::borderLeft();
}
-int LayoutTableCell::borderRight() const
+LayoutUnit LayoutTableCell::borderRight() const
{
return table()->collapseBorders() ? borderHalfRight(false) : LayoutBlockFlow::borderRight();
}
-int LayoutTableCell::borderTop() const
+LayoutUnit LayoutTableCell::borderTop() const
{
return table()->collapseBorders() ? borderHalfTop(false) : LayoutBlockFlow::borderTop();
}
-int LayoutTableCell::borderBottom() const
+LayoutUnit LayoutTableCell::borderBottom() const
{
return table()->collapseBorders() ? borderHalfBottom(false) : LayoutBlockFlow::borderBottom();
}
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=46191, make the collapsed border drawing
// work with different block flow values instead of being hard-coded to top-to-bottom.
-int LayoutTableCell::borderStart() const
+LayoutUnit LayoutTableCell::borderStart() const
{
return table()->collapseBorders() ? borderHalfStart(false) : LayoutBlockFlow::borderStart();
}
-int LayoutTableCell::borderEnd() const
+LayoutUnit LayoutTableCell::borderEnd() const
{
return table()->collapseBorders() ? borderHalfEnd(false) : LayoutBlockFlow::borderEnd();
}
-int LayoutTableCell::borderBefore() const
+LayoutUnit LayoutTableCell::borderBefore() const
{
return table()->collapseBorders() ? borderHalfBefore(false) : LayoutBlockFlow::borderBefore();
}
-int LayoutTableCell::borderAfter() const
+LayoutUnit LayoutTableCell::borderAfter() const
{
return table()->collapseBorders() ? borderHalfAfter(false) : LayoutBlockFlow::borderAfter();
}
-int LayoutTableCell::borderHalfLeft(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfLeft(bool outer) const
{
const ComputedStyle& styleForCellFlow = this->styleForCellFlow();
if (styleForCellFlow.isHorizontalWritingMode())
@@ -844,7 +844,7 @@ int LayoutTableCell::borderHalfLeft(bool outer) const
return styleForCellFlow.isFlippedBlocksWritingMode() ? borderHalfAfter(outer) : borderHalfBefore(outer);
}
-int LayoutTableCell::borderHalfRight(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfRight(bool outer) const
{
const ComputedStyle& styleForCellFlow = this->styleForCellFlow();
if (styleForCellFlow.isHorizontalWritingMode())
@@ -852,7 +852,7 @@ int LayoutTableCell::borderHalfRight(bool outer) const
return styleForCellFlow.isFlippedBlocksWritingMode() ? borderHalfBefore(outer) : borderHalfAfter(outer);
}
-int LayoutTableCell::borderHalfTop(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfTop(bool outer) const
{
const ComputedStyle& styleForCellFlow = this->styleForCellFlow();
if (styleForCellFlow.isHorizontalWritingMode())
@@ -860,7 +860,7 @@ int LayoutTableCell::borderHalfTop(bool outer) const
return styleForCellFlow.isLeftToRightDirection() ? borderHalfStart(outer) : borderHalfEnd(outer);
}
-int LayoutTableCell::borderHalfBottom(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfBottom(bool outer) const
{
const ComputedStyle& styleForCellFlow = this->styleForCellFlow();
if (styleForCellFlow.isHorizontalWritingMode())
@@ -868,7 +868,7 @@ int LayoutTableCell::borderHalfBottom(bool outer) const
return styleForCellFlow.isLeftToRightDirection() ? borderHalfEnd(outer) : borderHalfStart(outer);
}
-int LayoutTableCell::borderHalfStart(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfStart(bool outer) const
{
CollapsedBorderValue border = computeCollapsedStartBorder(DoNotIncludeBorderColor);
if (border.exists())
@@ -876,7 +876,7 @@ int LayoutTableCell::borderHalfStart(bool outer) const
return 0;
}
-int LayoutTableCell::borderHalfEnd(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfEnd(bool outer) const
{
CollapsedBorderValue border = computeCollapsedEndBorder(DoNotIncludeBorderColor);
if (border.exists())
@@ -884,7 +884,7 @@ int LayoutTableCell::borderHalfEnd(bool outer) const
return 0;
}
-int LayoutTableCell::borderHalfBefore(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfBefore(bool outer) const
{
CollapsedBorderValue border = computeCollapsedBeforeBorder(DoNotIncludeBorderColor);
if (border.exists())
@@ -892,7 +892,7 @@ int LayoutTableCell::borderHalfBefore(bool outer) const
return 0;
}
-int LayoutTableCell::borderHalfAfter(bool outer) const
+LayoutUnit LayoutTableCell::borderHalfAfter(bool outer) const
{
CollapsedBorderValue border = computeCollapsedAfterBorder(DoNotIncludeBorderColor);
if (border.exists())

Powered by Google App Engine
This is Rietveld 408576698