Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.h b/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.h
index 4f70b42..505dbab 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderTextFragment.h
@@ -31,43 +31,43 @@ namespace blink {
 // first letter and that must therefore have different styles (and positions in the render tree).
 // We cache offsets so that text transformations can be applied in such a way that we can recover
 // the original unaltered string from our corresponding DOM node.
-class RenderTextFragment FINAL : public RenderText {
+class RenderTextFragment final : public RenderText {
 public:
     RenderTextFragment(Node*, StringImpl*, int startOffset, int length);
     RenderTextFragment(Node*, StringImpl*);
     virtual ~RenderTextFragment();
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
-    virtual bool isTextFragment() const OVERRIDE { return true; }
+    virtual bool isTextFragment() const override { return true; }
 
-    virtual bool canBeSelectionLeaf() const OVERRIDE { return node() && node()->hasEditableStyle(); }
+    virtual bool canBeSelectionLeaf() const override { return node() && node()->hasEditableStyle(); }
 
     unsigned start() const { return m_start; }
     unsigned end() const { return m_end; }
-    virtual unsigned textStartOffset() const OVERRIDE { return start(); }
+    virtual unsigned textStartOffset() const override { return start(); }
 
     RenderBoxModelObject* firstLetter() const { return m_firstLetter; }
     void setFirstLetter(RenderBoxModelObject* firstLetter) { m_firstLetter = firstLetter; }
     RenderText* firstRenderTextInFirstLetter() const;
 
-    StringImpl* contentString() const { return m_contentString.get(); }
-    virtual PassRefPtr<StringImpl> originalText() const OVERRIDE;
+    void setContentString(StringImpl*);
+    virtual PassRefPtr<StringImpl> originalText() const override;
 
-    virtual void setText(PassRefPtr<StringImpl>, bool force = false) OVERRIDE;
+    virtual void setText(PassRefPtr<StringImpl>, bool force = false) override;
 
-    virtual void transformText() OVERRIDE;
+    virtual void transformText() override;
 
-    virtual const char* renderName() const OVERRIDE FINAL { return "RenderTextFragment"; }
+    virtual const char* renderName() const override final { return "RenderTextFragment"; }
 
 protected:
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
 private:
-    virtual void willBeDestroyed() OVERRIDE;
+    virtual void willBeDestroyed() override;
 
-    virtual UChar previousCharacter() const OVERRIDE;
+    virtual UChar previousCharacter() const override;
     RenderBlock* blockForAccompanyingFirstLetter() const;
-    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRIDE;
+    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
 
     unsigned m_start;
     unsigned m_end;