| 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 |
| 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 Library General Public License for more details. | 12 Library General Public License for more details. |
| 13 | 13 |
| 14 You should have received a copy of the GNU Library General Public License | 14 You should have received a copy of the GNU Library General Public License |
| 15 along with this library; see the file COPYING.LIB. If not, write to | 15 along with this library; see the file COPYING.LIB. If not, write to |
| 16 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 Boston, MA 02110-1301, USA. | 17 Boston, MA 02110-1301, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #include "config.h" | 20 #include "config.h" |
| 21 #include "platform/text/SegmentedString.h" | 21 #include "platform/text/SegmentedString.h" |
| 22 | 22 |
| 23 namespace WebCore { | 23 namespace blink { |
| 24 | 24 |
| 25 unsigned SegmentedString::length() const | 25 unsigned SegmentedString::length() const |
| 26 { | 26 { |
| 27 unsigned length = m_currentString.m_length; | 27 unsigned length = m_currentString.m_length; |
| 28 if (m_pushedChar1) { | 28 if (m_pushedChar1) { |
| 29 ++length; | 29 ++length; |
| 30 if (m_pushedChar2) | 30 if (m_pushedChar2) |
| 31 ++length; | 31 ++length; |
| 32 } | 32 } |
| 33 if (isComposite()) { | 33 if (isComposite()) { |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 return OrdinalNumber::fromZeroBasedInt(zeroBasedColumn); | 317 return OrdinalNumber::fromZeroBasedInt(zeroBasedColumn); |
| 318 } | 318 } |
| 319 | 319 |
| 320 void SegmentedString::setCurrentPosition(OrdinalNumber line, OrdinalNumber colum
nAftreProlog, int prologLength) | 320 void SegmentedString::setCurrentPosition(OrdinalNumber line, OrdinalNumber colum
nAftreProlog, int prologLength) |
| 321 { | 321 { |
| 322 m_currentLine = line.zeroBasedInt(); | 322 m_currentLine = line.zeroBasedInt(); |
| 323 m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed(
) + prologLength - columnAftreProlog.zeroBasedInt(); | 323 m_numberOfCharactersConsumedPriorToCurrentLine = numberOfCharactersConsumed(
) + prologLength - columnAftreProlog.zeroBasedInt(); |
| 324 } | 324 } |
| 325 | 325 |
| 326 } | 326 } |
| OLD | NEW |