Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / svg / RenderSVGBlock.h

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGBlock.h b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGBlock.h
index 2a1509f..6dd6575 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGBlock.h
+++ b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGBlock.h
@@ -30,35 +30,34 @@ class RenderSVGBlock : public RenderBlockFlow {
 public:
     explicit RenderSVGBlock(SVGElement*);
 
-    virtual LayoutRect visualOverflowRect() const OVERRIDE FINAL;
+    virtual LayoutRect visualOverflowRect() const override final;
 
-    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const OVERRIDE FINAL;
-    virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const OVERRIDE FINAL;
+    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override final;
+    virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const override final;
 
-    virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE FINAL;
-    virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL;
+    virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
+    virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override final;
 
-    virtual AffineTransform localTransform() const OVERRIDE FINAL { return m_localTransform; }
+    virtual AffineTransform localTransform() const override final { return m_localTransform; }
 
-    virtual LayerType layerTypeRequired() const OVERRIDE FINAL { return NoLayer; }
+    virtual LayerType layerTypeRequired() const override final { return NoLayer; }
 
-    virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE;
+    virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override;
 
 protected:
-    virtual void willBeDestroyed() OVERRIDE;
+    virtual void willBeDestroyed() override;
 
     AffineTransform m_localTransform;
 
+    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVG || RenderBlockFlow::isOfType(type); }
 private:
-    virtual void updateFromStyle() OVERRIDE FINAL;
+    virtual void updateFromStyle() override final;
 
-    virtual bool isSVG() const OVERRIDE FINAL { return true; }
+    virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
 
-    virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE FINAL;
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
 
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL;
-
-    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
+    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
 };
 
 }