Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/rendering/RenderTextFragment.h

Issue 9968048: Merge 112200 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderText.cpp ('k') | Source/WebCore/rendering/RenderTextFragment.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderTextFragment.h
===================================================================
--- Source/WebCore/rendering/RenderTextFragment.h (revision 112901)
+++ Source/WebCore/rendering/RenderTextFragment.h (working copy)
@@ -48,13 +48,16 @@
StringImpl* contentString() const { return m_contentString.get(); }
virtual PassRefPtr<StringImpl> originalText() const;
+ virtual void setText(PassRefPtr<StringImpl>, bool force = false) OVERRIDE;
+
+ virtual void transformText() OVERRIDE;
+
protected:
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
private:
virtual void willBeDestroyed();
- virtual void setTextInternal(PassRefPtr<StringImpl>);
virtual UChar previousCharacter() const;
RenderBlock* blockForAccompanyingFirstLetter() const;
@@ -62,7 +65,6 @@
unsigned m_end;
RefPtr<StringImpl> m_contentString;
RenderObject* m_firstLetter;
- bool m_allowFragmentReset;
};
inline RenderTextFragment* toRenderTextFragment(RenderObject* object)
« no previous file with comments | « Source/WebCore/rendering/RenderText.cpp ('k') | Source/WebCore/rendering/RenderTextFragment.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698