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

Side by Side Diff: Source/core/rendering/InlineTextBox.h

Issue 554613004: TextBlob: Start caching a text blob per InlineTextBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rewrite in light of changed Font::drawText signature Created 6 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 | Annotate | Revision Log
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, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 4 * Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011 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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #ifndef InlineTextBox_h 23 #ifndef InlineTextBox_h
24 #define InlineTextBox_h 24 #define InlineTextBox_h
25 25
26 #include "core/rendering/InlineBox.h" 26 #include "core/rendering/InlineBox.h"
27 #include "core/rendering/RenderText.h" // so textRenderer() can be inline 27 #include "core/rendering/RenderText.h" // so textRenderer() can be inline
28 #include "platform/fonts/TextBlob.h"
28 #include "platform/text/TextRun.h" 29 #include "platform/text/TextRun.h"
29 #include "wtf/Forward.h" 30 #include "wtf/Forward.h"
30 31
31 namespace blink { 32 namespace blink {
32 33
33 struct CompositionUnderline; 34 struct CompositionUnderline;
34 class DocumentMarker; 35 class DocumentMarker;
35 class GraphicsContext; 36 class GraphicsContext;
36 37
37 const unsigned short cNoTruncation = USHRT_MAX; 38 const unsigned short cNoTruncation = USHRT_MAX;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 virtual float positionForOffset(int offset) const; 155 virtual float positionForOffset(int offset) const;
155 156
156 bool containsCaretOffset(int offset) const; // false for offset after line b reak 157 bool containsCaretOffset(int offset) const; // false for offset after line b reak
157 158
158 // Fills a vector with the pixel width of each character. 159 // Fills a vector with the pixel width of each character.
159 void characterWidths(Vector<float>&) const; 160 void characterWidths(Vector<float>&) const;
160 161
161 private: 162 private:
162 InlineTextBox* m_prevTextBox; // The previous box that also uses our RenderO bject 163 InlineTextBox* m_prevTextBox; // The previous box that also uses our RenderO bject
163 InlineTextBox* m_nextTextBox; // The next box that also uses our RenderObjec t 164 InlineTextBox* m_nextTextBox; // The next box that also uses our RenderObjec t
165 TextBlobPtr m_textBlobCache;
f(malita) 2014/09/12 13:21:23 naming nit: this sounds a bit like a general/multi
jbroman 2014/09/13 00:06:42 m_cachedTextBlob was previously the name, and I bi
jbroman 2014/09/17 22:25:37 Actually, using a hash map on the side makes this
164 166
165 int m_start; 167 int m_start;
166 unsigned short m_len; 168 unsigned short m_len;
167 169
168 unsigned short m_truncation; // Where to truncate when text overflow is appl ied. We use special constants to 170 unsigned short m_truncation; // Where to truncate when text overflow is appl ied. We use special constants to
169 // denote no truncation (the whole run paints) and full tr uncation (nothing paints at all). 171 // denote no truncation (the whole run paints) and full tr uncation (nothing paints at all).
170 172
171 unsigned underlinePaintStart(const CompositionUnderline&); 173 unsigned underlinePaintStart(const CompositionUnderline&);
172 unsigned underlinePaintEnd(const CompositionUnderline&); 174 unsigned underlinePaintEnd(const CompositionUnderline&);
173 175
(...skipping 24 matching lines...) Expand all
198 200
199 inline AffineTransform InlineTextBox::rotation(const FloatRect& boxRect, Rotatio nDirection rotationDirection) 201 inline AffineTransform InlineTextBox::rotation(const FloatRect& boxRect, Rotatio nDirection rotationDirection)
200 { 202 {
201 return rotationDirection == Clockwise ? AffineTransform(0, 1, -1, 0, boxRect .x() + boxRect.maxY(), boxRect.maxY() - boxRect.x()) 203 return rotationDirection == Clockwise ? AffineTransform(0, 1, -1, 0, boxRect .x() + boxRect.maxY(), boxRect.maxY() - boxRect.x())
202 : AffineTransform(0, -1, 1, 0, boxRect.x() - boxRect.maxY(), boxRect.x() + boxRect.maxY()); 204 : AffineTransform(0, -1, 1, 0, boxRect.x() - boxRect.maxY(), boxRect.x() + boxRect.maxY());
203 } 205 }
204 206
205 } // namespace blink 207 } // namespace blink
206 208
207 #endif // InlineTextBox_h 209 #endif // InlineTextBox_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/InlineTextBox.cpp » ('j') | Source/core/rendering/InlineTextBox.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698