| Index: sky/engine/core/rendering/RenderBlock.h
|
| diff --git a/sky/engine/core/rendering/RenderBlock.h b/sky/engine/core/rendering/RenderBlock.h
|
| index e7d297af410277c19eb8cd5006a9cb68e66a125d..9e059be90c36b7f5dd498aa110d3a3dd17864e66 100644
|
| --- a/sky/engine/core/rendering/RenderBlock.h
|
| +++ b/sky/engine/core/rendering/RenderBlock.h
|
| @@ -328,8 +328,6 @@ private:
|
|
|
| bool hasCaret() const;
|
|
|
| - virtual bool avoidsFloats() const override { return true; }
|
| -
|
| bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
|
| virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&) { return false; }
|
| @@ -405,7 +403,6 @@ protected:
|
| unsigned m_hasMarkupTruncation : 1;
|
| unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
|
| mutable unsigned m_hasOnlySelfCollapsingChildren : 1;
|
| - mutable unsigned m_descendantsWithFloatsMarkedForLayout : 1;
|
|
|
| // FIXME-BLOCKFLOW: Remove this when the line layout stuff has all moved out of RenderBlock
|
| friend class LineBreaker;
|
|
|