| Index: Source/core/html/track/vtt/BufferedLineReader.cpp
|
| diff --git a/Source/core/html/track/vtt/BufferedLineReader.cpp b/Source/core/html/track/vtt/BufferedLineReader.cpp
|
| index 3401e5cab949a2f8a34863a5bf31052e5088f475..61b8932ae3a4a13fe82b8dbce0ac929c0efbba49 100644
|
| --- a/Source/core/html/track/vtt/BufferedLineReader.cpp
|
| +++ b/Source/core/html/track/vtt/BufferedLineReader.cpp
|
| @@ -42,7 +42,7 @@ bool BufferedLineReader::getLine(String& line)
|
| // in the middle of a CRLF pair. If the next character is a LF (U+000A)
|
| // then skip it, and then (unconditionally) return the buffered line.
|
| if (!m_buffer.isEmpty()) {
|
| - scanCharacter(newlineCharacter);
|
| + scanCharacter(characterNewline);
|
| m_maybeSkipLF = false;
|
| }
|
| // If there was no (new) data available, then keep m_maybeSkipLF set,
|
| @@ -56,17 +56,17 @@ bool BufferedLineReader::getLine(String& line)
|
| UChar c = m_buffer.currentChar();
|
| m_buffer.advance();
|
|
|
| - if (c == newlineCharacter || c == carriageReturn) {
|
| + if (c == characterNewline || c == characterCarriageReturn) {
|
| // We found a line ending. Return the accumulated line.
|
| shouldReturnLine = true;
|
| - checkForLF = (c == carriageReturn);
|
| + checkForLF = (c == characterCarriageReturn);
|
| break;
|
| }
|
|
|
| // NULs are transformed into U+FFFD (REPLACEMENT CHAR.) in step 1 of
|
| // the WebVTT parser algorithm.
|
| if (c == '\0')
|
| - c = replacementCharacter;
|
| + c = characterReplacement;
|
|
|
| m_lineBuffer.append(c);
|
| }
|
| @@ -75,7 +75,7 @@ bool BufferedLineReader::getLine(String& line)
|
| // May be in the middle of a CRLF pair.
|
| if (!m_buffer.isEmpty()) {
|
| // Scan a potential newline character.
|
| - scanCharacter(newlineCharacter);
|
| + scanCharacter(characterNewline);
|
| } else {
|
| // Check for the LF on the next call (unless we reached EOS, in
|
| // which case we'll return the contents of the line buffer, and
|
|
|