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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.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/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index 2b869f79db28311e900a4ba41ad5071f9a8bebc6..e81700f6041d2b4d7db747849e18b51c5b839f3e 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -1213,8 +1213,9 @@ LayoutRect LayoutBoxModelObject::localCaretRectForEmptyElement(
if (fontData)
height = LayoutUnit(fontData->getFontMetrics().height());
LayoutUnit verticalSpace =
- lineHeight(true, currentStyle.isHorizontalWritingMode() ? HorizontalLine
- : VerticalLine,
+ lineHeight(true,
+ currentStyle.isHorizontalWritingMode() ? HorizontalLine
+ : VerticalLine,
PositionOfInteriorLineBoxes) -
height;
LayoutUnit y = paddingTop() + borderTop() + (verticalSpace / 2);
@@ -1309,8 +1310,9 @@ void LayoutBoxModelObject::moveChildTo(LayoutBoxModelObject* toBoxModelObject,
if (fullRemoveInsert && isLayoutBlock() && child->isBox())
toLayoutBox(child)->removeFromPercentHeightContainer();
- if (fullRemoveInsert && (toBoxModelObject->isLayoutBlock() ||
- toBoxModelObject->isLayoutInline())) {
+ if (fullRemoveInsert &&
+ (toBoxModelObject->isLayoutBlock() ||
+ toBoxModelObject->isLayoutInline())) {
// Takes care of adding the new child correctly if toBlock and fromBlock
// have different kind of children (block vs inline).
toBoxModelObject->addChild(virtualChildren()->removeChildNode(this, child),
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutCounter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698