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

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

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.cpp ('k') | Source/core/layout/line/RootInlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/RootInlineBox.h
diff --git a/Source/core/layout/line/RootInlineBox.h b/Source/core/layout/line/RootInlineBox.h
index cfb66e313c802be3b63879d08736640046f9fe4b..2be1e9dca480393677158a82d0ccf1f094ace3a2 100644
--- a/Source/core/layout/line/RootInlineBox.h
+++ b/Source/core/layout/line/RootInlineBox.h
@@ -122,16 +122,16 @@ public:
InlineBox* closestLeafChildForPoint(const LayoutPoint&, bool onlyEditableLeaves);
InlineBox* closestLeafChildForLogicalLeftPosition(LayoutUnit, bool onlyEditableLeaves = false);
- void appendFloat(RenderBox* floatingBox)
+ void appendFloat(LayoutBox* floatingBox)
{
ASSERT(!isDirty());
if (m_floats)
m_floats->append(floatingBox);
else
- m_floats= adoptPtr(new Vector<RenderBox*>(1, floatingBox));
+ m_floats= adoptPtr(new Vector<LayoutBox*>(1, floatingBox));
}
- Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
+ Vector<LayoutBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
virtual void extractLineBoxFromLayoutObject() override final;
virtual void attachLineBoxToLayoutObject() override final;
@@ -192,7 +192,7 @@ private:
// Floats hanging off the line are pushed into this vector during layout. It is only
// good for as long as the line has not been marked dirty.
- OwnPtr<Vector<RenderBox*>> m_floats;
+ OwnPtr<Vector<LayoutBox*>> m_floats;
LayoutUnit m_lineTop;
LayoutUnit m_lineBottom;
« no previous file with comments | « Source/core/layout/line/LineBreaker.cpp ('k') | Source/core/layout/line/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698