webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 14 insertions, 26 deletions

diff --git a/Source/WebCore/rendering/RenderTextFragment.h b/Source/WebCore/rendering/RenderTextFragment.h
index 1c70a055a..7bf2fb1ed 100644
--- a/Source/WebCore/rendering/RenderTextFragment.h
+++ b/Source/WebCore/rendering/RenderTextFragment.h
@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef RenderTextFragment_h
-#define RenderTextFragment_h
+#pragma once
 
 #include "RenderText.h"
 
@@ -39,29 +38,30 @@ public:
 
     virtual ~RenderTextFragment();
 
-    virtual bool isTextFragment() const override { return true; }
-
-    virtual bool canBeSelectionLeaf() const override;
+    bool canBeSelectionLeaf() const override;
 
     unsigned start() const { return m_start; }
     unsigned end() const { return m_end; }
 
     RenderBoxModelObject* firstLetter() const { return m_firstLetter; }
     void setFirstLetter(RenderBoxModelObject& firstLetter) { m_firstLetter = &firstLetter; }
+    
+    RenderBlock* blockForAccompanyingFirstLetter();
 
+    void setContentString(const String& text);
     StringImpl* contentString() const { return m_contentString.impl(); }
 
-    virtual void setText(const String&, bool force = false) override;
+    void setText(const String&, bool force = false) override;
 
     const String& altText() const { return m_altText; }
     void setAltText(const String& altText) { m_altText = altText; }
     
 private:
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
-    virtual void willBeDestroyed() override;
+    bool isTextFragment() const override { return true; }
+    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+    void willBeDestroyed() override;
 
-    virtual UChar previousCharacter() const override;
-    RenderBlock* blockForAccompanyingFirstLetter();
+    UChar previousCharacter() const override;
 
     unsigned m_start;
     unsigned m_end;
@@ -71,21 +71,9 @@ private:
     RenderBoxModelObject* m_firstLetter;
 };
 
-inline RenderTextFragment* toRenderTextFragment(RenderObject* object)
-{ 
-    ASSERT_WITH_SECURITY_IMPLICATION(!object || toRenderText(object)->isTextFragment());
-    return static_cast<RenderTextFragment*>(object);
-}
-
-inline const RenderTextFragment* toRenderTextFragment(const RenderObject* object)
-{ 
-    ASSERT_WITH_SECURITY_IMPLICATION(!object || toRenderText(object)->isTextFragment());
-    return static_cast<const RenderTextFragment*>(object);
-}
-
-// This will catch anyone doing an unnecessary cast.
-void toRenderTextFragment(const RenderTextFragment*);
-
 } // namespace WebCore
 
-#endif // RenderTextFragment_h
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::RenderTextFragment)
+    static bool isType(const WebCore::RenderText& renderer) { return renderer.isTextFragment(); }
+    static bool isType(const WebCore::RenderObject& renderer) { return is<WebCore::RenderText>(renderer) && isType(downcast<WebCore::RenderText>(renderer)); }
+SPECIALIZE_TYPE_TRAITS_END()