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

Side by Side Diff: Source/WebCore/rendering/RenderText.h

Issue 10916347: Merge 127381 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 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 unified diff | Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderQuote.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 27 matching lines...) Expand all
38 virtual ~RenderText(); 38 virtual ~RenderText();
39 #endif 39 #endif
40 40
41 virtual const char* renderName() const; 41 virtual const char* renderName() const;
42 42
43 virtual bool isTextFragment() const; 43 virtual bool isTextFragment() const;
44 virtual bool isWordBreak() const; 44 virtual bool isWordBreak() const;
45 45
46 virtual PassRefPtr<StringImpl> originalText() const; 46 virtual PassRefPtr<StringImpl> originalText() const;
47 47
48 void updateTextIfNeeded()
49 {
50 if (preferredLogicalWidthsDirty())
51 updateText();
52 }
53
48 void extractTextBox(InlineTextBox*); 54 void extractTextBox(InlineTextBox*);
49 void attachTextBox(InlineTextBox*); 55 void attachTextBox(InlineTextBox*);
50 void removeTextBox(InlineTextBox*); 56 void removeTextBox(InlineTextBox*);
51 57
52 StringImpl* text() const { return m_text.impl(); } 58 StringImpl* text() const { return m_text.impl(); }
53 String textWithoutTranscoding() const; 59 String textWithoutTranscoding() const;
54 60
55 InlineTextBox* createInlineTextBox(); 61 InlineTextBox* createInlineTextBox();
56 void dirtyLineBoxes(bool fullLayout); 62 void dirtyLineBoxes(bool fullLayout);
57 63
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 bool knownToHaveNoOverflowAndNoFallbackFonts() const { return m_knownToHaveN oOverflowAndNoFallbackFonts; } 138 bool knownToHaveNoOverflowAndNoFallbackFonts() const { return m_knownToHaveN oOverflowAndNoFallbackFonts; }
133 139
134 void removeAndDestroyTextBoxes(); 140 void removeAndDestroyTextBoxes();
135 141
136 protected: 142 protected:
137 virtual void willBeDestroyed(); 143 virtual void willBeDestroyed();
138 144
139 virtual void styleWillChange(StyleDifference, const RenderStyle*) { } 145 virtual void styleWillChange(StyleDifference, const RenderStyle*) { }
140 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 146 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
141 147
148 virtual void updateText() { }
142 virtual void setTextInternal(PassRefPtr<StringImpl>); 149 virtual void setTextInternal(PassRefPtr<StringImpl>);
143 virtual UChar previousCharacter() const; 150 virtual UChar previousCharacter() const;
144 151
145 virtual InlineTextBox* createTextBox(); // Subclassed by SVG. 152 virtual InlineTextBox* createTextBox(); // Subclassed by SVG.
146 153
147 private: 154 private:
148 void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFont Data*>& fallbackFonts, GlyphOverflow&); 155 void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFont Data*>& fallbackFonts, GlyphOverflow&);
149 156
150 bool computeCanUseSimpleFontCodePath() const; 157 bool computeCanUseSimpleFontCodePath() const;
151 158
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 inline void RenderText::checkConsistency() const 219 inline void RenderText::checkConsistency() const
213 { 220 {
214 } 221 }
215 #endif 222 #endif
216 223
217 void applyTextTransform(const RenderStyle*, String&, UChar); 224 void applyTextTransform(const RenderStyle*, String&, UChar);
218 225
219 } // namespace WebCore 226 } // namespace WebCore
220 227
221 #endif // RenderText_h 228 #endif // RenderText_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderQuote.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698