| Index: Source/core/rendering/svg/RenderSVGRoot.h
|
| diff --git a/Source/core/rendering/svg/RenderSVGRoot.h b/Source/core/rendering/svg/RenderSVGRoot.h
|
| index a310602194052ffeb008c67b7a5985faf70ad975..dc1340427de896bdfd02149fc1d4df54d0fa5fed 100644
|
| --- a/Source/core/rendering/svg/RenderSVGRoot.h
|
| +++ b/Source/core/rendering/svg/RenderSVGRoot.h
|
| @@ -40,7 +40,7 @@ public:
|
| bool isEmbeddedThroughSVGImage() const;
|
| bool isEmbeddedThroughFrameContainingSVGDocument() const;
|
|
|
| - virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const;
|
| + virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const OVERRIDE;
|
|
|
| RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
|
| RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
|
| @@ -49,8 +49,8 @@ public:
|
| RenderObjectChildList* children() { return &m_children; }
|
|
|
| bool isLayoutSizeChanged() const { return m_isLayoutSizeChanged; }
|
| - virtual void setNeedsBoundariesUpdate() { m_needsBoundariesOrTransformUpdate = true; }
|
| - virtual void setNeedsTransformUpdate() { m_needsBoundariesOrTransformUpdate = true; }
|
| + virtual void setNeedsBoundariesUpdate() OVERRIDE { m_needsBoundariesOrTransformUpdate = true; }
|
| + virtual void setNeedsTransformUpdate() OVERRIDE { m_needsBoundariesOrTransformUpdate = true; }
|
|
|
| IntSize containerSize() const { return m_containerSize; }
|
| void setContainerSize(const IntSize& containerSize) { m_containerSize = containerSize; }
|
| @@ -62,31 +62,31 @@ public:
|
| const AffineTransform& localToBorderBoxTransform() const { return m_localToBorderBoxTransform; }
|
|
|
| private:
|
| - virtual RenderObjectChildList* virtualChildren() { return children(); }
|
| - virtual const RenderObjectChildList* virtualChildren() const { return children(); }
|
| + virtual RenderObjectChildList* virtualChildren() OVERRIDE { return children(); }
|
| + virtual const RenderObjectChildList* virtualChildren() const OVERRIDE { return children(); }
|
|
|
| - virtual const char* renderName() const { return "RenderSVGRoot"; }
|
| - virtual bool isSVGRoot() const OVERRIDE FINAL { return true; }
|
| - virtual bool isSVG() const OVERRIDE FINAL { return true; }
|
| + virtual const char* renderName() const OVERRIDE { return "RenderSVGRoot"; }
|
| + virtual bool isSVGRoot() const OVERRIDE { return true; }
|
| + virtual bool isSVG() const OVERRIDE { return true; }
|
|
|
| virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = ComputeActual) const OVERRIDE;
|
| - virtual LayoutUnit computeReplacedLogicalHeight() const;
|
| - virtual void layout();
|
| - virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
|
| + virtual LayoutUnit computeReplacedLogicalHeight() const OVERRIDE;
|
| + virtual void layout() OVERRIDE;
|
| + virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE;
|
|
|
| - virtual void willBeDestroyed();
|
| - virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
|
| + virtual void willBeDestroyed() OVERRIDE;
|
| + virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
|
| virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE;
|
| virtual void removeChild(RenderObject*) OVERRIDE;
|
|
|
| virtual void insertedIntoTree() OVERRIDE;
|
| virtual void willBeRemovedFromTree() OVERRIDE;
|
|
|
| - virtual const AffineTransform& localToParentTransform() const;
|
| + virtual const AffineTransform& localToParentTransform() const OVERRIDE;
|
|
|
| - virtual FloatRect objectBoundingBox() const { return m_objectBoundingBox; }
|
| - virtual FloatRect strokeBoundingBox() const { return m_strokeBoundingBox; }
|
| - virtual FloatRect repaintRectInLocalCoordinates() const { return m_repaintBoundingBox; }
|
| + virtual FloatRect objectBoundingBox() const OVERRIDE { return m_objectBoundingBox; }
|
| + virtual FloatRect strokeBoundingBox() const OVERRIDE { return m_strokeBoundingBox; }
|
| + virtual FloatRect repaintRectInLocalCoordinates() const OVERRIDE { return m_repaintBoundingBox; }
|
|
|
| virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
|
|
|
| @@ -96,8 +96,8 @@ private:
|
| virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
|
| virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
|
|
|
| - virtual bool canBeSelectionLeaf() const { return false; }
|
| - virtual bool canHaveChildren() const { return true; }
|
| + virtual bool canBeSelectionLeaf() const OVERRIDE { return false; }
|
| + virtual bool canHaveChildren() const OVERRIDE { return true; }
|
|
|
| void updateCachedBoundaries();
|
| void buildLocalToBorderBoxTransform();
|
|
|