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, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights 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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 charactersWithHyphen->append(hyphenString); | 501 charactersWithHyphen->append(hyphenString); |
502 string = charactersWithHyphen->toString().createView(); | 502 string = charactersWithHyphen->toString().createView(); |
503 maximumLength = string.length(); | 503 maximumLength = string.length(); |
504 } | 504 } |
505 | 505 |
506 ASSERT(maximumLength >= static_cast<int>(string.length())); | 506 ASSERT(maximumLength >= static_cast<int>(string.length())); |
507 | 507 |
508 TextRun run(string, textPos(), expansion(), expansionBehavior(), direction()
, dirOverride() || style->rtlOrdering() == VisualOrder, !renderer().canUseSimple
FontCodePath()); | 508 TextRun run(string, textPos(), expansion(), expansionBehavior(), direction()
, dirOverride() || style->rtlOrdering() == VisualOrder, !renderer().canUseSimple
FontCodePath()); |
509 run.setTabSize(!style->collapseWhiteSpace(), style->tabSize()); | 509 run.setTabSize(!style->collapseWhiteSpace(), style->tabSize()); |
510 run.setCharacterScanForCodePath(!renderer().canUseSimpleFontCodePath()); | 510 run.setCharacterScanForCodePath(!renderer().canUseSimpleFontCodePath()); |
| 511 run.setTextJustify(style->textJustify()); |
511 | 512 |
512 // Propagate the maximum length of the characters buffer to the TextRun, eve
n when we're only processing a substring. | 513 // Propagate the maximum length of the characters buffer to the TextRun, eve
n when we're only processing a substring. |
513 run.setCharactersLength(maximumLength); | 514 run.setCharactersLength(maximumLength); |
514 ASSERT(run.charactersLength() >= run.length()); | 515 ASSERT(run.charactersLength() >= run.length()); |
515 return run; | 516 return run; |
516 } | 517 } |
517 | 518 |
518 TextRun InlineTextBox::constructTextRunForInspector(RenderStyle* style, const Fo
nt& font) const | 519 TextRun InlineTextBox::constructTextRunForInspector(RenderStyle* style, const Fo
nt& font) const |
519 { | 520 { |
520 return InlineTextBox::constructTextRun(style, font); | 521 return InlineTextBox::constructTextRun(style, font); |
(...skipping 19 matching lines...) Expand all Loading... |
540 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj); | 541 printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj); |
541 const int rendererCharacterOffset = 75; | 542 const int rendererCharacterOffset = 75; |
542 for (; printedCharacters < rendererCharacterOffset; printedCharacters++) | 543 for (; printedCharacters < rendererCharacterOffset; printedCharacters++) |
543 fputc(' ', stderr); | 544 fputc(' ', stderr); |
544 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d
ata()); | 545 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d
ata()); |
545 } | 546 } |
546 | 547 |
547 #endif | 548 #endif |
548 | 549 |
549 } // namespace blink | 550 } // namespace blink |
OLD | NEW |