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, 2011 Apple Inc. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
5 * Copyright (C) 2013 Adobe Systems Incorporated. | 5 * Copyright (C) 2013 Adobe Systems Incorporated. |
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 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 | 721 |
722 inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
& hyphenated) | 722 inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
& hyphenated) |
723 { | 723 { |
724 if (!m_current.offset()) | 724 if (!m_current.offset()) |
725 m_appliedStartWidth = false; | 725 m_appliedStartWidth = false; |
726 | 726 |
727 RenderText* renderText = toRenderText(m_current.object()); | 727 RenderText* renderText = toRenderText(m_current.object()); |
728 | 728 |
729 bool isSVGText = renderText->isSVGInlineText(); | 729 bool isSVGText = renderText->isSVGInlineText(); |
730 | 730 |
| 731 // If we have left a no-wrap inline and entered an autowrap inline while ign
oring spaces |
| 732 // then we need to mark the start of the autowrap inline as a potential line
break now. |
| 733 if (m_autoWrap && !RenderStyle::autoWrap(m_lastWS) && m_ignoringSpaces) { |
| 734 m_width.commit(); |
| 735 m_lineBreak.moveToStartOf(m_current.object()); |
| 736 } |
| 737 |
731 if (renderText->style()->hasTextCombine() && m_current.object()->isCombineTe
xt() && !toRenderCombineText(m_current.object())->isCombined()) { | 738 if (renderText->style()->hasTextCombine() && m_current.object()->isCombineTe
xt() && !toRenderCombineText(m_current.object())->isCombined()) { |
732 RenderCombineText* combineRenderer = toRenderCombineText(m_current.objec
t()); | 739 RenderCombineText* combineRenderer = toRenderCombineText(m_current.objec
t()); |
733 combineRenderer->combineText(); | 740 combineRenderer->combineText(); |
734 // The length of the renderer's text may have changed. Increment stale i
terator positions | 741 // The length of the renderer's text may have changed. Increment stale i
terator positions |
735 if (iteratorIsBeyondEndOfRenderCombineText(m_lineBreak, combineRenderer)
) { | 742 if (iteratorIsBeyondEndOfRenderCombineText(m_lineBreak, combineRenderer)
) { |
736 ASSERT(iteratorIsBeyondEndOfRenderCombineText(m_resolver.position(),
combineRenderer)); | 743 ASSERT(iteratorIsBeyondEndOfRenderCombineText(m_resolver.position(),
combineRenderer)); |
737 m_lineBreak.increment(); | 744 m_lineBreak.increment(); |
738 m_resolver.position().increment(&m_resolver); | 745 m_resolver.position().increment(&m_resolver); |
739 } | 746 } |
740 } | 747 } |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1140 m_lineBreak.increment(); | 1147 m_lineBreak.increment(); |
1141 } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.object())); | 1148 } while (!m_lineBreak.atEnd() && isEmptyInline(m_lineBreak.object())); |
1142 } | 1149 } |
1143 | 1150 |
1144 return m_lineBreak; | 1151 return m_lineBreak; |
1145 } | 1152 } |
1146 | 1153 |
1147 } | 1154 } |
1148 | 1155 |
1149 #endif // BreakingContextInlineHeaders_h | 1156 #endif // BreakingContextInlineHeaders_h |
OLD | NEW |