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) 2014 Adobe Systems Inc. | 5 * Copyright (C) 2014 Adobe Systems Inc. |
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 if (currentMidpoint >= lineMidpointState.numMidpoints()) { | 50 if (currentMidpoint >= lineMidpointState.numMidpoints()) { |
51 // We don't have a midpoint for this box yet. | 51 // We don't have a midpoint for this box yet. |
52 lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i])
; | 52 lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i])
; |
53 } else { | 53 } else { |
54 ASSERT(lineMidpointState.midpoints()[currentMidpoint].object() =
= m_objects[i]); | 54 ASSERT(lineMidpointState.midpoints()[currentMidpoint].object() =
= m_objects[i]); |
55 ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].object
() == m_objects[i]); | 55 ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].object
() == m_objects[i]); |
56 } | 56 } |
57 currentMidpoint += 2; | 57 currentMidpoint += 2; |
58 } | 58 } |
59 } else if (!lBreak.object()) { | 59 } else if (!lBreak.object()) { |
60 ASSERT(m_whitespace->isText()); | |
61 ASSERT(collapseFirstSpace == CollapseFirstSpace); | 60 ASSERT(collapseFirstSpace == CollapseFirstSpace); |
62 // Add a new end midpoint that stops right at the very end. | 61 // Add a new end midpoint that stops right at the very end. |
63 unsigned length = m_whitespace->textLength(); | 62 unsigned length = m_whitespace->textLength(); |
64 unsigned pos = length >= 2 ? length - 2 : UINT_MAX; | 63 unsigned pos = length >= 2 ? length - 2 : UINT_MAX; |
65 InlineIterator endMid(0, m_whitespace, pos); | 64 InlineIterator endMid(0, m_whitespace, pos); |
66 lineMidpointState.startIgnoringSpaces(endMid); | 65 lineMidpointState.startIgnoringSpaces(endMid); |
67 for (size_t i = 0; i < m_objects.size(); ++i) { | 66 for (size_t i = 0; i < m_objects.size(); ++i) { |
68 lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i]); | 67 lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i]); |
69 } | 68 } |
70 } | 69 } |
71 } | 70 } |
72 | 71 |
73 } | 72 } |
OLD | NEW |