| 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), | 
|  |