| Index: Source/core/rendering/RenderTextFragment.h
|
| diff --git a/Source/core/rendering/RenderTextFragment.h b/Source/core/rendering/RenderTextFragment.h
|
| index 4f70b4293d4849c91f2a5fb9e1eb84b595671699..8a690a188866e47503da3ebbc08a90ce0a85c0f3 100644
|
| --- a/Source/core/rendering/RenderTextFragment.h
|
| +++ b/Source/core/rendering/RenderTextFragment.h
|
| @@ -36,7 +36,6 @@ public:
|
| RenderTextFragment(Node*, StringImpl*, int startOffset, int length);
|
| RenderTextFragment(Node*, StringImpl*);
|
| virtual ~RenderTextFragment();
|
| - virtual void trace(Visitor*) OVERRIDE;
|
|
|
| virtual bool isTextFragment() const OVERRIDE { return true; }
|
|
|
| @@ -46,11 +45,8 @@ public:
|
| unsigned end() const { return m_end; }
|
| 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(); }
|
| + PassRefPtr<StringImpl> completeText() const;
|
| virtual PassRefPtr<StringImpl> originalText() const OVERRIDE;
|
|
|
| virtual void setText(PassRefPtr<StringImpl>, bool force = false) OVERRIDE;
|
| @@ -59,20 +55,15 @@ public:
|
|
|
| virtual const char* renderName() const OVERRIDE FINAL { return "RenderTextFragment"; }
|
|
|
| -protected:
|
| - virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
|
| -
|
| private:
|
| - virtual void willBeDestroyed() OVERRIDE;
|
| -
|
| virtual UChar previousCharacter() const OVERRIDE;
|
| - RenderBlock* blockForAccompanyingFirstLetter() const;
|
| virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRIDE;
|
|
|
| + Text* associatedTextNode() const;
|
| +
|
| unsigned m_start;
|
| unsigned m_end;
|
| RefPtr<StringImpl> m_contentString;
|
| - RawPtrWillBeMember<RenderBoxModelObject> m_firstLetter;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(RenderTextFragment, RenderObject, object, toRenderText(object)->isTextFragment(), toRenderText(object).isTextFragment());
|
|
|