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

Side by Side Diff: Source/platform/graphics/TextRun.h

Issue 54743004: Rendering text-justify:distribute for 8 bit characters. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 float horizontalGlyphStretch() const { return m_horizontalGlyphStretch; } 189 float horizontalGlyphStretch() const { return m_horizontalGlyphStretch; }
190 void setHorizontalGlyphStretch(float scale) { m_horizontalGlyphStretch = sca le; } 190 void setHorizontalGlyphStretch(float scale) { m_horizontalGlyphStretch = sca le; }
191 191
192 bool allowTabs() const { return m_allowTabs; } 192 bool allowTabs() const { return m_allowTabs; }
193 unsigned tabSize() const { return m_tabSize; } 193 unsigned tabSize() const { return m_tabSize; }
194 void setTabSize(bool, unsigned); 194 void setTabSize(bool, unsigned);
195 195
196 float xPos() const { return m_xpos; } 196 float xPos() const { return m_xpos; }
197 void setXPos(float xPos) { m_xpos = xPos; } 197 void setXPos(float xPos) { m_xpos = xPos; }
198 float expansion() const { return m_expansion; } 198 float expansion() const { return m_expansion; }
199 bool isDistributeJustification() const { return m_distributeJustification; }
200 void setDistributeJustification(bool distributeJustification) { m_distribute Justification = distributeJustification; }
199 bool allowsLeadingExpansion() const { return m_expansionBehavior & AllowLead ingExpansion; } 201 bool allowsLeadingExpansion() const { return m_expansionBehavior & AllowLead ingExpansion; }
200 bool allowsTrailingExpansion() const { return m_expansionBehavior & AllowTra ilingExpansion; } 202 bool allowsTrailingExpansion() const { return m_expansionBehavior & AllowTra ilingExpansion; }
201 TextDirection direction() const { return static_cast<TextDirection>(m_direct ion); } 203 TextDirection direction() const { return static_cast<TextDirection>(m_direct ion); }
202 bool rtl() const { return m_direction == RTL; } 204 bool rtl() const { return m_direction == RTL; }
203 bool ltr() const { return m_direction == LTR; } 205 bool ltr() const { return m_direction == LTR; }
204 bool directionalOverride() const { return m_directionalOverride; } 206 bool directionalOverride() const { return m_directionalOverride; }
205 bool characterScanForCodePath() const { return m_characterScanForCodePath; } 207 bool characterScanForCodePath() const { return m_characterScanForCodePath; }
206 bool applyRunRounding() const { return m_applyRunRounding; } 208 bool applyRunRounding() const { return m_applyRunRounding; }
207 bool applyWordRounding() const { return m_applyWordRounding; } 209 bool applyWordRounding() const { return m_applyWordRounding; }
208 bool spacingDisabled() const { return m_disableSpacing; } 210 bool spacingDisabled() const { return m_disableSpacing; }
(...skipping 29 matching lines...) Expand all
238 unsigned m_charactersLength; // Marks the end of the characters buffer. Defa ult equals to m_len. 240 unsigned m_charactersLength; // Marks the end of the characters buffer. Defa ult equals to m_len.
239 unsigned m_len; 241 unsigned m_len;
240 242
241 // m_xpos is the x position relative to the left start of the text line, not relative to the left 243 // m_xpos is the x position relative to the left start of the text line, not relative to the left
242 // start of the containing block. In the case of right alignment or center a lignment, left start of 244 // start of the containing block. In the case of right alignment or center a lignment, left start of
243 // the text line is not the same as left start of the containing block. 245 // the text line is not the same as left start of the containing block.
244 float m_xpos; 246 float m_xpos;
245 float m_horizontalGlyphStretch; 247 float m_horizontalGlyphStretch;
246 248
247 float m_expansion; 249 float m_expansion;
250 bool m_distributeJustification;
leviw_travelin_and_unemployed 2013/11/01 20:39:14 Pack this along with the other bits below, otherwi
dw.im 2013/11/02 03:13:01 will do like this. + unsigned m_distributeJustific
dw.im 2013/11/04 02:11:09 Done.. as bool m_distributeJustification : 1;
248 ExpansionBehavior m_expansionBehavior : 2; 251 ExpansionBehavior m_expansionBehavior : 2;
249 unsigned m_is8Bit : 1; 252 unsigned m_is8Bit : 1;
250 unsigned m_allowTabs : 1; 253 unsigned m_allowTabs : 1;
251 unsigned m_direction : 1; 254 unsigned m_direction : 1;
252 unsigned m_directionalOverride : 1; // Was this direction set by an override character. 255 unsigned m_directionalOverride : 1; // Was this direction set by an override character.
253 unsigned m_characterScanForCodePath : 1; 256 unsigned m_characterScanForCodePath : 1;
254 unsigned m_applyRunRounding : 1; 257 unsigned m_applyRunRounding : 1;
255 unsigned m_applyWordRounding : 1; 258 unsigned m_applyWordRounding : 1;
256 unsigned m_disableSpacing : 1; 259 unsigned m_disableSpacing : 1;
257 unsigned m_tabSize; 260 unsigned m_tabSize;
(...skipping 16 matching lines...) Expand all
274 } 277 }
275 278
276 const TextRun& run; 279 const TextRun& run;
277 int from; 280 int from;
278 int to; 281 int to;
279 FloatRect bounds; 282 FloatRect bounds;
280 }; 283 };
281 284
282 } 285 }
283 #endif 286 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698