| Index: Source/core/rendering/InlineFlowBox.h
|
| diff --git a/Source/core/rendering/InlineFlowBox.h b/Source/core/rendering/InlineFlowBox.h
|
| index 4ef789b8b56970900e60233f3c59fcc1bd97dd3e..c5213c1ad2a2db0a4c546705849c73af3fa5e400 100644
|
| --- a/Source/core/rendering/InlineFlowBox.h
|
| +++ b/Source/core/rendering/InlineFlowBox.h
|
| @@ -80,7 +80,7 @@ public:
|
| InlineBox* firstChild() const { checkConsistency(); return m_firstChild; }
|
| InlineBox* lastChild() const { checkConsistency(); return m_lastChild; }
|
|
|
| - virtual bool isLeaf() const { return false; }
|
| + virtual bool isLeaf() const FINAL { return false; }
|
|
|
| InlineBox* firstLeafChild() const;
|
| InlineBox* lastLeafChild() const;
|
| @@ -88,7 +88,7 @@ public:
|
| typedef void (*CustomInlineBoxRangeReverse)(void* userData, Vector<InlineBox*>::iterator first, Vector<InlineBox*>::iterator last);
|
| void collectLeafBoxesInLogicalOrder(Vector<InlineBox*>&, CustomInlineBoxRangeReverse customReverseImplementation = 0, void* userData = 0) const;
|
|
|
| - virtual void setConstructed()
|
| + virtual void setConstructed() FINAL
|
| {
|
| InlineBox::setConstructed();
|
| for (InlineBox* child = firstChild(); child; child = child->nextOnLine())
|
| @@ -96,9 +96,9 @@ public:
|
| }
|
|
|
| void addToLine(InlineBox* child);
|
| - virtual void deleteLine(RenderArena*);
|
| - virtual void extractLine();
|
| - virtual void attachLine();
|
| + virtual void deleteLine(RenderArena*) FINAL;
|
| + virtual void extractLine() FINAL;
|
| + virtual void attachLine() FINAL;
|
| virtual void adjustPosition(float dx, float dy);
|
|
|
| virtual void extractLineBoxFromRenderObject();
|
| @@ -109,8 +109,8 @@ public:
|
|
|
| IntRect roundedFrameRect() const;
|
|
|
| - virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
|
| - virtual void paintMask(PaintInfo&, const LayoutPoint&);
|
| + virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) FINAL;
|
| + virtual void paintMask(PaintInfo&, const LayoutPoint&) FINAL;
|
| void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
|
| void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
|
| void paintBoxShadow(const PaintInfo&, RenderStyle*, ShadowStyle, const LayoutRect&);
|
| @@ -201,7 +201,7 @@ public:
|
|
|
| virtual RenderObject::SelectionState selectionState();
|
|
|
| - virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const OVERRIDE;
|
| + virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const OVERRIDE FINAL;
|
| virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool&) OVERRIDE;
|
|
|
| bool hasTextChildren() const { return m_hasTextChildren; }
|
| @@ -299,7 +299,7 @@ public:
|
| parent()->clearDescendantsHaveSameLineHeightAndBaseline();
|
| }
|
|
|
| - virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
|
| + virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE FINAL;
|
|
|
| private:
|
| void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow);
|
| @@ -311,7 +311,7 @@ private:
|
| protected:
|
| OwnPtr<RenderOverflow> m_overflow;
|
|
|
| - virtual bool isInlineFlowBox() const { return true; }
|
| + virtual bool isInlineFlowBox() const FINAL { return true; }
|
|
|
| InlineBox* m_firstChild;
|
| InlineBox* m_lastChild;
|
|
|