OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
3 * Copyright (C) 2006 Apple Computer Inc. | 3 * Copyright (C) 2006 Apple Computer Inc. |
4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
5 * Copyright (C) 2008 Rob Buis <buis@kde.org> | 5 * Copyright (C) 2008 Rob Buis <buis@kde.org> |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 return U16_IS_TRAIL(run[index + 1]); | 207 return U16_IS_TRAIL(run[index + 1]); |
208 } | 208 } |
209 | 209 |
210 TextRun constructTextRun(LayoutSVGInlineText& text, | 210 TextRun constructTextRun(LayoutSVGInlineText& text, |
211 unsigned position, | 211 unsigned position, |
212 unsigned length, | 212 unsigned length, |
213 TextDirection textDirection) { | 213 TextDirection textDirection) { |
214 const ComputedStyle& style = text.styleRef(); | 214 const ComputedStyle& style = text.styleRef(); |
215 | 215 |
216 TextRun run( | 216 TextRun run( |
217 static_cast<const LChar*>( | 217 // characters, will be set below if non-zero. |
218 nullptr) // characters, will be set below if non-zero. | 218 static_cast<const LChar*>(nullptr), |
219 , | 219 0, // length, will be set below if non-zero. |
220 0 // length, will be set below if non-zero. | 220 0, // xPos, only relevant with allowTabs=true |
221 , | 221 0, // padding, only relevant for justified text, not relevant for SVG |
222 0 // xPos, only relevant with allowTabs=true | |
223 , | |
224 0 // padding, only relevant for justified text, not relevant for SVG | |
225 , | |
226 TextRun::AllowTrailingExpansion, textDirection, | 222 TextRun::AllowTrailingExpansion, textDirection, |
227 isOverride(style.unicodeBidi()) /* directionalOverride */); | 223 isOverride(style.unicodeBidi()) /* directionalOverride */); |
228 | 224 |
229 if (length) { | 225 if (length) { |
230 if (text.is8Bit()) | 226 if (text.is8Bit()) |
231 run.setText(text.characters8() + position, length); | 227 run.setText(text.characters8() + position, length); |
232 else | 228 else |
233 run.setText(text.characters16() + position, length); | 229 run.setText(text.characters16() + position, length); |
234 } | 230 } |
235 | 231 |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 } | 398 } |
403 | 399 |
404 PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const { | 400 PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const { |
405 RefPtr<StringImpl> result = LayoutText::originalText(); | 401 RefPtr<StringImpl> result = LayoutText::originalText(); |
406 if (!result) | 402 if (!result) |
407 return nullptr; | 403 return nullptr; |
408 return normalizeWhitespace(result); | 404 return normalizeWhitespace(result); |
409 } | 405 } |
410 | 406 |
411 } // namespace blink | 407 } // namespace blink |
OLD | NEW |