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

Unified Diff: sky/engine/core/rendering/RootInlineBox.h

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block
Patch Set: Remove unused float-related code instead of moving it. Created 5 years, 8 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 | « sky/engine/core/rendering/RenderView.cpp ('k') | sky/engine/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « sky/engine/core/rendering/RenderView.cpp ('k') | sky/engine/core/rendering/RootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698