| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 ASSERT_WITH_SECURITY_IMPLICATION(m_separatorIndex <= m_separ
ator.size()); | 84 ASSERT_WITH_SECURITY_IMPLICATION(m_separatorIndex <= m_separ
ator.size()); |
| 85 chunk.append(m_separator.data(), m_separatorIndex); | 85 chunk.append(m_separator.data(), m_separatorIndex); |
| 86 m_separatorIndex = 0; | 86 m_separatorIndex = 0; |
| 87 } | 87 } |
| 88 chunk.append(currentCharacter); | 88 chunk.append(currentCharacter); |
| 89 continue; | 89 continue; |
| 90 } | 90 } |
| 91 m_separatorIndex++; | 91 m_separatorIndex++; |
| 92 if (m_separatorIndex == m_separator.size()) { | 92 if (m_separatorIndex == m_separator.size()) { |
| 93 if (includeSeparator) | 93 if (includeSeparator) |
| 94 chunk.append(m_separator); | 94 chunk.appendVector(m_separator); |
| 95 m_separatorIndex = 0; | 95 m_separatorIndex = 0; |
| 96 return true; | 96 return true; |
| 97 } | 97 } |
| 98 } | 98 } |
| 99 | 99 |
| 100 // Read the next segment. | 100 // Read the next segment. |
| 101 m_segmentIndex = 0; | 101 m_segmentIndex = 0; |
| 102 m_bufferPosition += m_segmentLength; | 102 m_bufferPosition += m_segmentLength; |
| 103 m_segmentLength = m_buffer->getSomeData(m_segment, m_bufferPosition); | 103 m_segmentLength = m_buffer->getSomeData(m_segment, m_bufferPosition); |
| 104 if (!m_segmentLength) { | 104 if (!m_segmentLength) { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 break; | 141 break; |
| 142 } | 142 } |
| 143 data.append(segment, segmentLength); | 143 data.append(segment, segmentLength); |
| 144 readBytesCount += segmentLength; | 144 readBytesCount += segmentLength; |
| 145 bufferPosition += segmentLength; | 145 bufferPosition += segmentLength; |
| 146 } | 146 } |
| 147 return readBytesCount; | 147 return readBytesCount; |
| 148 } | 148 } |
| 149 | 149 |
| 150 } | 150 } |
| OLD | NEW |