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

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

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: Added trivial tests safe to rebaseline to TestExpectations Created 4 years, 10 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.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.h b/third_party/WebKit/Source/core/layout/LayoutTableCell.h
index 3cb5fa121cd640f74e6fc6ec3890c73dfa145c29..f45d14460ca64413c3fb2d465bfc90b84dd372ce 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.h
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.h
@@ -150,7 +150,7 @@ public:
// In strict mode, box-sizing: content-box do the right thing and actually add in the border and padding.
// Call computedCSSPadding* directly to avoid including implicitPadding.
if (!document().inQuirksMode() && style()->boxSizing() != BORDER_BOX)
- styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddingAfter()).floor() + borderBefore() + borderAfter();
+ styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddingAfter() + borderBefore() + borderAfter()).floor();
return styleLogicalHeight;
}
@@ -165,14 +165,14 @@ public:
void setCellLogicalWidth(int constrainedLogicalWidth, SubtreeLayoutScope&);
- int borderLeft() const override;
- int borderRight() const override;
- int borderTop() const override;
- int borderBottom() const override;
- int borderStart() const override;
- int borderEnd() const override;
- int borderBefore() const override;
- int borderAfter() const override;
+ LayoutUnit borderLeft() const override;
+ LayoutUnit borderRight() const override;
+ LayoutUnit borderTop() const override;
+ LayoutUnit borderBottom() const override;
+ LayoutUnit borderStart() const override;
+ LayoutUnit borderEnd() const override;
+ LayoutUnit borderBefore() const override;
+ LayoutUnit borderAfter() const override;
void collectBorderValues(LayoutTable::CollapsedBorderValues&);
static void sortBorderValues(LayoutTable::CollapsedBorderValues&);
@@ -294,15 +294,15 @@ private:
LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, const PaintInvalidationState*) const override;
- int borderHalfLeft(bool outer) const;
- int borderHalfRight(bool outer) const;
- int borderHalfTop(bool outer) const;
- int borderHalfBottom(bool outer) const;
+ LayoutUnit borderHalfLeft(bool outer) const;
+ LayoutUnit borderHalfRight(bool outer) const;
+ LayoutUnit borderHalfTop(bool outer) const;
+ LayoutUnit borderHalfBottom(bool outer) const;
- int borderHalfStart(bool outer) const;
- int borderHalfEnd(bool outer) const;
- int borderHalfBefore(bool outer) const;
- int borderHalfAfter(bool outer) const;
+ LayoutUnit borderHalfStart(bool outer) const;
+ LayoutUnit borderHalfEnd(bool outer) const;
+ LayoutUnit borderHalfBefore(bool outer) const;
+ LayoutUnit borderHalfAfter(bool outer) const;
void setIntrinsicPaddingBefore(int p) { m_intrinsicPaddingBefore = p; }
void setIntrinsicPaddingAfter(int p) { m_intrinsicPaddingAfter = p; }
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTable.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTableCell.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698