Move overflow in InlineTextBox::adjustPosition() if it has glyph overflows

Source/core/layout/line/InlineFlowBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 237 matching lines @@
         attachLineBoxToLayoutObject();
     for (InlineBox* child = firstChild(); child; child = child->nextOnLine())
         child->attachLine();
 }
 
 void InlineFlowBox::attachLineBoxToLayoutObject()
 {
     lineBoxes()->attachLineBox(this);
 }
 
-void InlineFlowBox::adjustPosition(LayoutUnit dx, LayoutUnit dy)
+void InlineFlowBox::move(const LayoutSize& delta)
 {
-    InlineBox::adjustPosition(dx, dy);
+    InlineBox::move(delta);
     for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
         if (child->layoutObject().isOutOfFlowPositioned())
             continue;
-        child->adjustPosition(dx, dy);
+        child->move(delta);
     }
     if (m_overflow)
-        m_overflow->move(dx, dy); // FIXME: Rounding error here since overflow was pixel snapped, but nobody other than list markers passes non-integral values here.
+        m_overflow->move(delta.width(), delta.height()); // FIXME: Rounding error here since overflow was pixel snapped, but nobody other than list markers passes non-integral values here.

[leviw_travelin_and_unemployed, 2015/06/16 20:09:17]

Grumble grumble about more dx dy (not an issue with this patch)

[Xianzhu, 2015/06/16 20:43:23]

Acknowledged.

 }
 
 LineBoxList* InlineFlowBox::lineBoxes() const
 {
     return toLayoutInline(layoutObject()).lineBoxes();
 }
 
 static inline bool isLastChildForLayoutObject(LayoutObject* ancestor, LayoutObject* child)
 {
     if (!child)
@@ skipping 312 matching lines @@
         adjustmentForChildrenWithSameLineHeightAndBaseline = logicalTop();
         if (parent())
             adjustmentForChildrenWithSameLineHeightAndBaseline += (boxModelObject()->borderBefore() + boxModelObject()->paddingBefore());
     }
 
     for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
         if (curr->layoutObject().isOutOfFlowPositioned())
             continue; // Positioned placeholders don't affect calculations.
 
         if (descendantsHaveSameLineHeightAndBaseline()) {
-            curr->adjustBlockDirectionPosition(adjustmentForChildrenWithSameLineHeightAndBaseline.toFloat());
+            curr->moveInBlockDirection(adjustmentForChildrenWithSameLineHeightAndBaseline.toFloat());
             continue;
         }
 
         InlineFlowBox* inlineFlowBox = curr->isInlineFlowBox() ? toInlineFlowBox(curr) : nullptr;
         bool childAffectsTopBottomPos = true;
         if (curr->verticalAlign() == TOP) {
             curr->setLogicalTop(top.toFloat());
         } else if (curr->verticalAlign() == BOTTOM) {
             curr->setLogicalTop((top + maxHeight - curr->lineHeight()).toFloat());
         } else {
@@ skipping 700 matching lines @@
         ASSERT(child->prevOnLine() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 } // namespace blink