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

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

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
« no previous file with comments | « Source/core/layout/line/LineBreaker.h ('k') | Source/core/layout/line/RootInlineBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/LineBreaker.cpp
diff --git a/Source/core/layout/line/LineBreaker.cpp b/Source/core/layout/line/LineBreaker.cpp
index 15b1228cab4cbbc152cee65ac460d8fd15e81766..4b1e7c42f192b54441d66c26fc1186d81d0cafbb 100644
--- a/Source/core/layout/line/LineBreaker.cpp
+++ b/Source/core/layout/line/LineBreaker.cpp
@@ -33,7 +33,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {
LayoutObject* object = resolver.position().object();
if (object->isOutOfFlowPositioned()) {
- RenderBox* box = toRenderBox(object);
+ LayoutBox* box = toLayoutBox(object);
setStaticPositions(m_block, box);
bool originallyInline = box->style()->isOriginalDisplayInlineType();
box->markStaticPositionedBoxForLayout(box->style()->isHorizontalWritingMode(), originallyInline);
@@ -42,7 +42,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
lineInfo.incrementRunsFromLeadingWhitespace();
}
} else if (object->isFloating()) {
- m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
+ m_block->positionNewFloatOnLine(m_block->insertFloatingObject(*toLayoutBox(object)), lastFloatFromPreviousLine, lineInfo, width);
}
resolver.position().increment(&resolver);
}
« no previous file with comments | « Source/core/layout/line/LineBreaker.h ('k') | Source/core/layout/line/RootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698