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

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

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 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.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
index 4146da633a4f574417f9255a7ca53b0a0e0af252..ca553f297c08b1cfb9eb0f6ba6370181d775e4a7 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
@@ -448,11 +448,12 @@ LayoutRect LayoutTableCell::localVisualRect() const {
LayoutRect selfVisualOverflowRect = this->selfVisualOverflowRect();
LayoutPoint location(std::max(LayoutUnit(left), -selfVisualOverflowRect.x()),
std::max(LayoutUnit(top), -selfVisualOverflowRect.y()));
- return LayoutRect(-location.x(), -location.y(),
- location.x() + std::max(size().width() + right,
- selfVisualOverflowRect.maxX()),
- location.y() + std::max(size().height() + bottom,
- selfVisualOverflowRect.maxY()));
+ return LayoutRect(
+ -location.x(), -location.y(),
+ location.x() +
+ std::max(size().width() + right, selfVisualOverflowRect.maxX()),
+ location.y() +
+ std::max(size().height() + bottom, selfVisualOverflowRect.maxY()));
}
int LayoutTableCell::cellBaselinePosition() const {
@@ -670,11 +671,12 @@ CollapsedBorderValue LayoutTableCell::computeCollapsedStartBorder(
// (4) Our row group's start border.
result = chooseBorder(
- result, CollapsedBorderValue(
- section()->borderAdjoiningStartCell(this),
- includeColor ? section()->resolveColor(startColorProperty)
+ result,
+ CollapsedBorderValue(section()->borderAdjoiningStartCell(this),
+ includeColor
+ ? section()->resolveColor(startColorProperty)
: Color(),
- BorderPrecedenceRowGroup));
+ BorderPrecedenceRowGroup));
if (!result.exists())
return result;
}
@@ -882,12 +884,13 @@ CollapsedBorderValue LayoutTableCell::computeCollapsedEndBorder(
// col element is expected to be treated as if it "was present as many
// times as its span attribute specifies".
result = chooseBorder(
- result, CollapsedBorderValue(
- colAndColGroup.col->borderAdjoiningCellBefore(this),
- includeColor
- ? colAndColGroup.col->resolveColor(startColorProperty)
- : Color(),
- BorderPrecedenceColumn));
+ result,
+ CollapsedBorderValue(
+ colAndColGroup.col->borderAdjoiningCellBefore(this),
+ includeColor
+ ? colAndColGroup.col->resolveColor(startColorProperty)
+ : Color(),
+ BorderPrecedenceColumn));
if (!result.exists())
return result;
}
@@ -1011,11 +1014,12 @@ CollapsedBorderValue LayoutTableCell::computeCollapsedBeforeBorder(
.innermostColOrColGroup();
if (colElt) {
result = chooseBorder(
- result, CollapsedBorderValue(
- colElt->style()->borderBefore(),
- includeColor ? colElt->resolveColor(beforeColorProperty)
+ result,
+ CollapsedBorderValue(colElt->style()->borderBefore(),
+ includeColor
+ ? colElt->resolveColor(beforeColorProperty)
: Color(),
- BorderPrecedenceColumn));
+ BorderPrecedenceColumn));
if (!result.exists())
return result;
if (LayoutTableCol* enclosingColumnGroup =
@@ -1074,11 +1078,12 @@ CollapsedBorderValue LayoutTableCell::computeCollapsedAfterBorder(
if (nextCell) {
// (2) An after cell's before border.
result = chooseBorder(
- result, CollapsedBorderValue(
- nextCell->style()->borderBefore(),
- includeColor ? nextCell->resolveColor(beforeColorProperty)
+ result,
+ CollapsedBorderValue(nextCell->style()->borderBefore(),
+ includeColor
+ ? nextCell->resolveColor(beforeColorProperty)
: Color(),
- BorderPrecedenceCell));
+ BorderPrecedenceCell));
if (!result.exists())
return result;
}
@@ -1111,11 +1116,12 @@ CollapsedBorderValue LayoutTableCell::computeCollapsedAfterBorder(
if (rowIndex() + rowSpan() >= currSection->numRows()) {
// (5) Our row group's after border.
result = chooseBorder(
- result, CollapsedBorderValue(
- currSection->style()->borderAfter(),
- includeColor ? currSection->resolveColor(afterColorProperty)
+ result,
+ CollapsedBorderValue(currSection->style()->borderAfter(),
+ includeColor
+ ? currSection->resolveColor(afterColorProperty)
: Color(),
- BorderPrecedenceRowGroup));
+ BorderPrecedenceRowGroup));
if (!result.exists())
return result;
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTable.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTableSection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698