| 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. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. |
| 5 * All rights reserved. | 5 * 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 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 638 charactersWithHyphen->append(string); | 638 charactersWithHyphen->append(string); |
| 639 charactersWithHyphen->append(hyphenString); | 639 charactersWithHyphen->append(hyphenString); |
| 640 string = charactersWithHyphen->toString(); | 640 string = charactersWithHyphen->toString(); |
| 641 maximumLength = string.length(); | 641 maximumLength = string.length(); |
| 642 } | 642 } |
| 643 | 643 |
| 644 ASSERT(maximumLength >= static_cast<int>(string.length())); | 644 ASSERT(maximumLength >= static_cast<int>(string.length())); |
| 645 | 645 |
| 646 TextRun run(string, textPos().toFloat(), expansion(), expansionBehavior(), | 646 TextRun run(string, textPos().toFloat(), expansion(), expansionBehavior(), |
| 647 direction(), | 647 direction(), |
| 648 dirOverride() || style.rtlOrdering() == EOrder::Visual); | 648 dirOverride() || style.rtlOrdering() == EOrder::kVisual); |
| 649 run.setTabSize(!style.collapseWhiteSpace(), style.getTabSize()); | 649 run.setTabSize(!style.collapseWhiteSpace(), style.getTabSize()); |
| 650 run.setTextJustify(style.getTextJustify()); | 650 run.setTextJustify(style.getTextJustify()); |
| 651 | 651 |
| 652 // Propagate the maximum length of the characters buffer to the TextRun, even | 652 // Propagate the maximum length of the characters buffer to the TextRun, even |
| 653 // when we're only processing a substring. | 653 // when we're only processing a substring. |
| 654 run.setCharactersLength(maximumLength); | 654 run.setCharactersLength(maximumLength); |
| 655 ASSERT(run.charactersLength() >= run.length()); | 655 ASSERT(run.charactersLength() >= run.length()); |
| 656 return run; | 656 return run; |
| 657 } | 657 } |
| 658 | 658 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 688 const int layoutObjectCharacterOffset = 75; | 688 const int layoutObjectCharacterOffset = 75; |
| 689 for (; printedCharacters < layoutObjectCharacterOffset; printedCharacters++) | 689 for (; printedCharacters < layoutObjectCharacterOffset; printedCharacters++) |
| 690 fputc(' ', stderr); | 690 fputc(' ', stderr); |
| 691 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), | 691 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), |
| 692 value.utf8().data()); | 692 value.utf8().data()); |
| 693 } | 693 } |
| 694 | 694 |
| 695 #endif | 695 #endif |
| 696 | 696 |
| 697 } // namespace blink | 697 } // namespace blink |
| OLD | NEW |