Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderRubyText.h b/src/third_party/WebKit/Source/core/rendering/RenderRubyText.h
index a448359..c3750f9 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderRubyText.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderRubyText.h
@@ -35,22 +35,22 @@
 
 namespace blink {
 
-class RenderRubyText FINAL : public RenderBlockFlow {
+class RenderRubyText final : public RenderBlockFlow {
 public:
     RenderRubyText(Element*);
     virtual ~RenderRubyText();
 
-    virtual const char* renderName() const OVERRIDE { return "RenderRubyText"; }
+    virtual const char* renderName() const override { return "RenderRubyText"; }
 
-    virtual bool isRubyText() const OVERRIDE { return true; }
+    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRubyText || RenderBlockFlow::isOfType(type); }
 
-    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
+    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
 
 private:
-    virtual bool avoidsFloats() const OVERRIDE;
+    virtual bool avoidsFloats() const override;
 
-    virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const OVERRIDE;
-    virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const OVERRIDE;
+    virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const override;
+    virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, float& logicalLeft, float& logicalWidth) const override;
 };
 
 } // namespace blink