| Index: sky/engine/core/rendering/RenderInline.h
|
| diff --git a/sky/engine/core/rendering/RenderInline.h b/sky/engine/core/rendering/RenderInline.h
|
| index 5719d64f616d53ed8ea13fc1a848a3d06154f695..523f24a360e63c91ef864dac84fa5ff7b4398828 100644
|
| --- a/sky/engine/core/rendering/RenderInline.h
|
| +++ b/sky/engine/core/rendering/RenderInline.h
|
| @@ -74,7 +74,7 @@ public:
|
| InlineBox* firstLineBoxIncludingCulling() const { return alwaysCreateLineBoxes() ? firstLineBox() : culledInlineFirstLineBox(); }
|
| InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxes() ? lastLineBox() : culledInlineLastLineBox(); }
|
|
|
| - virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) const override final;
|
| + virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderBox* paintContainer = 0) const override final;
|
|
|
| bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForRenderInline(); }
|
| void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlwaysCreateLineBoxesForRenderInline(alwaysCreateLineBoxes); }
|
| @@ -114,14 +114,12 @@ private:
|
|
|
| virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) override final;
|
|
|
| - virtual LayerType layerTypeRequired() const override { return NoLayer; }
|
| -
|
| virtual LayoutUnit offsetLeft() const override final;
|
| virtual LayoutUnit offsetTop() const override final;
|
| virtual LayoutUnit offsetWidth() const override final { return linesBoundingBox().width(); }
|
| virtual LayoutUnit offsetHeight() const override final { return linesBoundingBox().height(); }
|
|
|
| - virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip) const override;
|
| + virtual void mapLocalToContainer(const RenderBox* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip) const override;
|
|
|
| virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override final;
|
|
|
| @@ -140,8 +138,6 @@ private:
|
|
|
| virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override final;
|
|
|
| - virtual void updateFromStyle() override final;
|
| -
|
| RenderObjectChildList m_children;
|
| RenderLineBoxList m_lineBoxes; // All of the line boxes created for this inline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
|
| };
|
|
|