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 f9daff37cf37551d982c29a1f0a9f54c9ce19991..8019468deacf4f675eca50a8cdc088ff3eb6799f 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp |
@@ -325,11 +325,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)); |
@@ -797,49 +797,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()) |
@@ -847,7 +847,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()) |
@@ -855,7 +855,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()) |
@@ -863,7 +863,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()) |
@@ -871,7 +871,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()) |
@@ -879,7 +879,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()) |
@@ -887,7 +887,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()) |
@@ -895,7 +895,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()) |