| OLD | NEW |
| 1 /* | 1 /* |
| 2 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 | 3 |
| 4 This library is free software; you can redistribute it and/or | 4 This library is free software; you can redistribute it and/or |
| 5 modify it under the terms of the GNU Library General Public | 5 modify it under the terms of the GNU Library General Public |
| 6 License as published by the Free Software Foundation; either | 6 License as published by the Free Software Foundation; either |
| 7 version 2 of the License, or (at your option) any later version. | 7 version 2 of the License, or (at your option) any later version. |
| 8 | 8 |
| 9 This library is distributed in the hope that it will be useful, | 9 This library is distributed in the hope that it will be useful, |
| 10 but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 if (isComposite()) { | 170 if (isComposite()) { |
| 171 Deque<SegmentedSubstring>::const_iterator it = m_substrings.begin(); | 171 Deque<SegmentedSubstring>::const_iterator it = m_substrings.begin(); |
| 172 Deque<SegmentedSubstring>::const_iterator e = m_substrings.end(); | 172 Deque<SegmentedSubstring>::const_iterator e = m_substrings.end(); |
| 173 for (; it != e; ++it) | 173 for (; it != e; ++it) |
| 174 it->appendTo(result); | 174 it->appendTo(result); |
| 175 } | 175 } |
| 176 return result.toString(); | 176 return result.toString(); |
| 177 } | 177 } |
| 178 | 178 |
| 179 void SegmentedString::advance(unsigned count, UChar* consumedCharacters) { | 179 void SegmentedString::advance(unsigned count, UChar* consumedCharacters) { |
| 180 ASSERT_WITH_SECURITY_IMPLICATION(count <= length()); | 180 SECURITY_DCHECK(count <= length()); |
| 181 for (unsigned i = 0; i < count; ++i) { | 181 for (unsigned i = 0; i < count; ++i) { |
| 182 consumedCharacters[i] = currentChar(); | 182 consumedCharacters[i] = currentChar(); |
| 183 advance(); | 183 advance(); |
| 184 } | 184 } |
| 185 } | 185 } |
| 186 | 186 |
| 187 void SegmentedString::advance8() { | 187 void SegmentedString::advance8() { |
| 188 decrementAndCheckLength(); | 188 decrementAndCheckLength(); |
| 189 m_currentChar = m_currentString.incrementAndGetCurrentChar8(); | 189 m_currentChar = m_currentString.incrementAndGetCurrentChar8(); |
| 190 } | 190 } |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 void SegmentedString::setCurrentPosition(OrdinalNumber line, | 284 void SegmentedString::setCurrentPosition(OrdinalNumber line, |
| 285 OrdinalNumber columnAftreProlog, | 285 OrdinalNumber columnAftreProlog, |
| 286 int prologLength) { | 286 int prologLength) { |
| 287 m_currentLine = line.zeroBasedInt(); | 287 m_currentLine = line.zeroBasedInt(); |
| 288 m_numberOfCharactersConsumedPriorToCurrentLine = | 288 m_numberOfCharactersConsumedPriorToCurrentLine = |
| 289 numberOfCharactersConsumed() + prologLength - | 289 numberOfCharactersConsumed() + prologLength - |
| 290 columnAftreProlog.zeroBasedInt(); | 290 columnAftreProlog.zeroBasedInt(); |
| 291 } | 291 } |
| 292 | 292 |
| 293 } // namespace blink | 293 } // namespace blink |
| OLD | NEW |