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

Unified Diff: Source/core/layout/line/RootInlineBox.cpp

Issue 1183003003: Move overflow in InlineTextBox::adjustPosition() if it has glyph overflows (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/line/RootInlineBox.h ('k') | Source/core/layout/svg/line/SVGRootInlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/RootInlineBox.cpp
diff --git a/Source/core/layout/line/RootInlineBox.cpp b/Source/core/layout/line/RootInlineBox.cpp
index 8ef89ce4cddf8d66f87b0eee8daa301fa1515006..054b7c9cb68caa2a4f0ebf0a3a7afca189ec63aa 100644
--- a/Source/core/layout/line/RootInlineBox.cpp
+++ b/Source/core/layout/line/RootInlineBox.cpp
@@ -167,17 +167,17 @@ bool RootInlineBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& lo
return InlineFlowBox::nodeAtPoint(result, locationInContainer, accumulatedOffset, lineTop, lineBottom);
}
-void RootInlineBox::adjustPosition(LayoutUnit dx, LayoutUnit dy)
+void RootInlineBox::move(const LayoutSize& delta)
{
- InlineFlowBox::adjustPosition(dx, dy);
- LayoutUnit blockDirectionDelta = isHorizontal() ? dy : dx; // The block direction delta is a LayoutUnit.
+ InlineFlowBox::move(delta);
+ LayoutUnit blockDirectionDelta = isHorizontal() ? delta.height() : delta.width();
m_lineTop += blockDirectionDelta;
m_lineBottom += blockDirectionDelta;
m_lineTopWithLeading += blockDirectionDelta;
m_lineBottomWithLeading += blockDirectionDelta;
m_selectionBottom += blockDirectionDelta;
if (hasEllipsisBox())
- ellipsisBox()->adjustPosition(dx, dy);
+ ellipsisBox()->move(delta);
}
void RootInlineBox::childRemoved(InlineBox* box)
@@ -235,7 +235,7 @@ LayoutUnit RootInlineBox::alignBoxesInBlockDirection(LayoutUnit heightOfBlock, G
if (annotationsAdjustment) {
// FIXME: Need to handle pagination here. We might have to move to the next page/column as a result of the
// ruby expansion.
- adjustBlockDirectionPosition(annotationsAdjustment.toFloat());
+ moveInBlockDirection(annotationsAdjustment.toFloat());
heightOfBlock += annotationsAdjustment;
}
« no previous file with comments | « Source/core/layout/line/RootInlineBox.h ('k') | Source/core/layout/svg/line/SVGRootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698