Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderRegion.h b/src/third_party/WebKit/Source/core/rendering/RenderRegion.h
index ebed05f..3975e21 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderRegion.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderRegion.h
@@ -43,7 +43,7 @@ class RenderRegion : public RenderBlockFlow {
 public:
     explicit RenderRegion(Element*, RenderFlowThread*);
 
-    virtual bool isRenderRegion() const OVERRIDE FINAL { return true; }
+    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderRegion || RenderBlockFlow::isOfType(type); }
 
     void setFlowThreadPortionRect(const LayoutRect& rect) { m_flowThreadPortionRect = rect; }
     LayoutRect flowThreadPortionRect() const { return m_flowThreadPortionRect; }
@@ -64,20 +64,20 @@ public:
     virtual LayoutUnit pageLogicalWidth() const;
     virtual LayoutUnit pageLogicalHeight() const;
 
-    virtual bool canHaveChildren() const OVERRIDE FINAL { return false; }
-    virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return true; }
+    virtual bool canHaveChildren() const override final { return false; }
+    virtual bool canHaveGeneratedChildren() const override final { return true; }
 
-    virtual const char* renderName() const OVERRIDE { return "RenderRegion"; }
+    virtual const char* renderName() const override { return "RenderRegion"; }
 
 protected:
-    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE FINAL;
+    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override final;
 
     LayoutRect overflowRectForFlowThreadPortion(const LayoutRect& flowThreadPortionRect, bool isFirstPortion, bool isLastPortion) const;
     void paintInvalidationOfFlowThreadContentRectangle(const LayoutRect& paintInvalidationRect, const LayoutRect& flowThreadPortionRect,
         const LayoutRect& flowThreadPortionOverflowRect, const LayoutPoint& regionLocation) const;
 
 private:
-    virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL;
+    virtual void layoutBlock(bool relayoutChildren) override final;
 
 protected:
     RenderFlowThread* m_flowThread;