| OLD | NEW |
| 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-2009, 2013 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004-2009, 2013 Apple Inc. All rights reserved. |
| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 UChar32 character = characterAt(i); | 272 UChar32 character = characterAt(i); |
| 273 if (!U16_IS_LEAD(character)) | 273 if (!U16_IS_LEAD(character)) |
| 274 return character; | 274 return character; |
| 275 UChar trail = characterAt(i + 1); | 275 UChar trail = characterAt(i + 1); |
| 276 return U16_IS_TRAIL(trail) ? U16_GET_SUPPLEMENTARY(character, trail) : chara
cter; | 276 return U16_IS_TRAIL(trail) ? U16_GET_SUPPLEMENTARY(character, trail) : chara
cter; |
| 277 } | 277 } |
| 278 | 278 |
| 279 inline float LayoutText::hyphenWidth(const Font& font, TextDirection direction) | 279 inline float LayoutText::hyphenWidth(const Font& font, TextDirection direction) |
| 280 { | 280 { |
| 281 const ComputedStyle& style = styleRef(); | 281 const ComputedStyle& style = styleRef(); |
| 282 return font.width(constructTextRun(font, style.hyphenString().string(), styl
e, direction)); | 282 return font.width(constructTextRun(font, style.hyphenString().getString(), s
tyle, direction)); |
| 283 } | 283 } |
| 284 | 284 |
| 285 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutText, isText()); | 285 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutText, isText()); |
| 286 | 286 |
| 287 #if !ENABLE(ASSERT) | 287 #if !ENABLE(ASSERT) |
| 288 inline void LayoutText::checkConsistency() const | 288 inline void LayoutText::checkConsistency() const |
| 289 { | 289 { |
| 290 } | 290 } |
| 291 #endif | 291 #endif |
| 292 | 292 |
| 293 inline LayoutText* Text::layoutObject() const | 293 inline LayoutText* Text::layoutObject() const |
| 294 { | 294 { |
| 295 return toLayoutText(CharacterData::layoutObject()); | 295 return toLayoutText(CharacterData::layoutObject()); |
| 296 } | 296 } |
| 297 | 297 |
| 298 void applyTextTransform(const ComputedStyle*, String&, UChar); | 298 void applyTextTransform(const ComputedStyle*, String&, UChar); |
| 299 | 299 |
| 300 } // namespace blink | 300 } // namespace blink |
| 301 | 301 |
| 302 #endif // LayoutText_h | 302 #endif // LayoutText_h |
| OLD | NEW |