| Index: sky/engine/core/rendering/RootInlineBox.h
|
| diff --git a/sky/engine/core/rendering/RootInlineBox.h b/sky/engine/core/rendering/RootInlineBox.h
|
| index e3fdc6d71a043c0f8fe696bc972ad4c93b79ccbc..6973c39102626fefccdaf6b2033db06892c7cc50 100644
|
| --- a/sky/engine/core/rendering/RootInlineBox.h
|
| +++ b/sky/engine/core/rendering/RootInlineBox.h
|
| @@ -28,14 +28,14 @@ namespace blink {
|
|
|
| class EllipsisBox;
|
| class HitTestResult;
|
| -class RenderBlockFlow;
|
| +class RenderParagraph;
|
|
|
| struct BidiStatus;
|
| struct GapRects;
|
|
|
| class RootInlineBox : public InlineFlowBox {
|
| public:
|
| - explicit RootInlineBox(RenderBlockFlow&);
|
| + explicit RootInlineBox(RenderParagraph&);
|
|
|
| virtual void destroy() override final;
|
|
|
| @@ -121,22 +121,11 @@ public:
|
|
|
| GapRects lineSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, LayoutUnit selTop, LayoutUnit selHeight, const PaintInfo*);
|
|
|
| - RenderBlockFlow& block() const;
|
| + RenderParagraph& block() const;
|
|
|
| InlineBox* closestLeafChildForPoint(const IntPoint&, bool onlyEditableLeaves);
|
| InlineBox* closestLeafChildForLogicalLeftPosition(int, bool onlyEditableLeaves = false);
|
|
|
| - void appendFloat(RenderBox* floatingBox)
|
| - {
|
| - ASSERT(!isDirty());
|
| - if (m_floats)
|
| - m_floats->append(floatingBox);
|
| - else
|
| - m_floats= adoptPtr(new Vector<RenderBox*>(1, floatingBox));
|
| - }
|
| -
|
| - Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
|
| -
|
| virtual void extractLineBoxFromRenderObject() override final;
|
| virtual void attachLineBoxToRenderObject() override final;
|
| virtual void removeLineBoxFromRenderObject() override final;
|
| @@ -219,10 +208,6 @@ private:
|
|
|
| OwnPtr<LineFragmentationData> m_fragmentationData;
|
|
|
| - // 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;
|
| -
|
| LayoutUnit m_lineTop;
|
| LayoutUnit m_lineBottom;
|
| LayoutUnit m_lineTopWithLeading;
|
|
|