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

Unified Diff: Source/core/layout/svg/line/SVGRootInlineBox.cpp

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove debugging code Created 5 years, 7 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: Source/core/layout/svg/line/SVGRootInlineBox.cpp
diff --git a/Source/core/layout/svg/line/SVGRootInlineBox.cpp b/Source/core/layout/svg/line/SVGRootInlineBox.cpp
index 7fe47c452113c1db7c2ccf6cd4c0d7210346d93f..90bd021d751fa52372ac80ab69de2b91d91f7fff 100644
--- a/Source/core/layout/svg/line/SVGRootInlineBox.cpp
+++ b/Source/core/layout/svg/line/SVGRootInlineBox.cpp
@@ -65,7 +65,7 @@ void SVGRootInlineBox::computePerCharacterLayoutInformation()
// Perform SVG text layout phase four
// Position & resize all SVGInlineText/FlowBoxes in the inline box tree, resize the root box as well as the LayoutSVGText parent block.
- FloatRectWillBeLayoutRect childRect;
+ LayoutRect childRect;
layoutChildBoxes(this, &childRect);
layoutRootBox(childRect);
}
@@ -101,10 +101,10 @@ void SVGRootInlineBox::layoutCharactersInTextBoxes(InlineFlowBox* start, SVGText
}
}
-void SVGRootInlineBox::layoutChildBoxes(InlineFlowBox* start, FloatRectWillBeLayoutRect* childRect)
+void SVGRootInlineBox::layoutChildBoxes(InlineFlowBox* start, LayoutRect* childRect)
{
for (InlineBox* child = start->firstChild(); child; child = child->nextOnLine()) {
- FloatRectWillBeLayoutRect boxRect;
+ LayoutRect boxRect;
if (child->isSVGInlineTextBox()) {
ASSERT(child->layoutObject().isSVGInlineText());
@@ -133,14 +133,14 @@ void SVGRootInlineBox::layoutChildBoxes(InlineFlowBox* start, FloatRectWillBeLay
}
}
-void SVGRootInlineBox::layoutRootBox(const FloatRectWillBeLayoutRect& childRect)
+void SVGRootInlineBox::layoutRootBox(const LayoutRect& childRect)
{
LayoutBlockFlow& parentBlock = block();
// Finally, assign the root block position, now that all content is laid out.
// FIXME: the call to enclosingLayoutRect() below is temporary and should be removed once
// the transition to LayoutUnit-based types is complete (crbug.com/321237)
- LayoutRect boundingRect = childRect.enclosingLayoutRect();
+ LayoutRect boundingRect = enclosingLayoutRect(childRect);
parentBlock.setLocation(boundingRect.location());
parentBlock.setSize(boundingRect.size());

Powered by Google App Engine
This is Rietveld 408576698