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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (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
Index: Source/core/layout/line/RootInlineBox.h
diff --git a/Source/core/layout/line/RootInlineBox.h b/Source/core/layout/line/RootInlineBox.h
index 93432549ca303f191d79cc37086b52d5c194ec1c..5f736e9a62a85ef36d8e1b799250a9c27b48ecfb 100644
--- a/Source/core/layout/line/RootInlineBox.h
+++ b/Source/core/layout/line/RootInlineBox.h
@@ -79,9 +79,9 @@ public:
virtual RenderLineBoxList* rendererLineBoxes() const override final;
- RenderObject* lineBreakObj() const { return m_lineBreakObj; }
+ LayoutObject* lineBreakObj() const { return m_lineBreakObj; }
BidiStatus lineBreakBidiStatus() const;
- void setLineBreakInfo(RenderObject*, unsigned breakPos, const BidiStatus&);
+ void setLineBreakInfo(LayoutObject*, unsigned breakPos, const BidiStatus&);
unsigned lineBreakPos() const { return m_lineBreakPos; }
void setLineBreakPos(unsigned p) { m_lineBreakPos = p; }
@@ -111,7 +111,7 @@ public:
using InlineBox::hasSelectedChildren;
using InlineBox::setHasSelectedChildren;
- virtual RenderObject::SelectionState selectionState() const override final;
+ virtual LayoutObject::SelectionState selectionState() const override final;
InlineBox* firstSelectedBox() const;
InlineBox* lastSelectedBox() const;
@@ -133,9 +133,9 @@ public:
Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
- virtual void extractLineBoxFromRenderObject() override final;
- virtual void attachLineBoxToRenderObject() override final;
- virtual void removeLineBoxFromRenderObject() override final;
+ virtual void extractLineBoxFromLayoutObject() override final;
+ virtual void attachLineBoxToLayoutObject() override final;
+ virtual void removeLineBoxFromLayoutObject() override final;
FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); }
@@ -187,7 +187,7 @@ private:
// Where this line ended. The exact object and the position within that object are stored so that
// we can create an InlineIterator beginning just after the end of this line.
- RenderObject* m_lineBreakObj;
+ LayoutObject* m_lineBreakObj;
RefPtr<BidiContext> m_lineBreakContext;
// Floats hanging off the line are pushed into this vector during layout. It is only

Powered by Google App Engine
This is Rietveld 408576698