OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All right r
eserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Apple Inc. All right r
eserved. |
4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google 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 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 pos = m_endOfRunAtEndOfLine.m_pos; | 620 pos = m_endOfRunAtEndOfLine.m_pos; |
621 } | 621 } |
622 // It's OK to add runs for zero-length RenderObjects, just don't mak
e the run larger than it should be | 622 // It's OK to add runs for zero-length RenderObjects, just don't mak
e the run larger than it should be |
623 int end = obj->length() ? pos + 1 : 0; | 623 int end = obj->length() ? pos + 1 : 0; |
624 if (isolateTracker.inIsolate()) | 624 if (isolateTracker.inIsolate()) |
625 addFakeRunIfNecessary(obj, start, end, *this, isolateTracker); | 625 addFakeRunIfNecessary(obj, start, end, *this, isolateTracker); |
626 else | 626 else |
627 adjustMidpointsAndAppendRunsForObjectIfNeeded(obj, start, end, *
this, AppendingRunsForObject, isolateTracker); | 627 adjustMidpointsAndAppendRunsForObjectIfNeeded(obj, start, end, *
this, AppendingRunsForObject, isolateTracker); |
628 } | 628 } |
629 | 629 |
| 630 if (isEndOfLine) |
| 631 m_reachedEndOfLine = true; |
630 m_eor.increment(); | 632 m_eor.increment(); |
631 m_sor = m_eor; | 633 m_sor = m_eor; |
632 } | 634 } |
633 | 635 |
634 m_direction = WTF::Unicode::OtherNeutral; | 636 m_direction = WTF::Unicode::OtherNeutral; |
635 m_status.eor = WTF::Unicode::OtherNeutral; | 637 m_status.eor = WTF::Unicode::OtherNeutral; |
636 } | 638 } |
637 | 639 |
638 } | 640 } |
639 | 641 |
640 #endif // InlineIterator_h | 642 #endif // InlineIterator_h |
OLD | NEW |