Add a flushing mechanism for the WebVTTParser

Source/core/html/track/WebVTTParser.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 117 matching lines @@
 
 void WebVTTParser::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions)
 {
     outputRegions = m_regionList;
     m_regionList.clear();
 }
 
 void WebVTTParser::parseBytes(const char* data, unsigned length)
 {
     String textData = m_decoder->decode(data, length);
+    parse(textData);
+}
 
+void WebVTTParser::flush()
+{
+    String textData = m_decoder->flush();
+    parse(textData);
+    flushPendingCue();
+}
+
+void WebVTTParser::parse(const String& textData)
+{
     // 4.8.10.13.3 WHATWG WebVTT Parser algorithm.
     // 1-3 - Initial setup.
     unsigned position = 0;
 
     while (position < textData.length()) {
         String line = collectNextLine(textData, &position);
 
         switch (m_state) {
         case Initial:
             // 4-12 - Check for a valid WebVTT signature.
@@ skipping 35 matching lines @@
                 m_state = Id;
                 break;
             }
 
             // 40 - Collect cue timings and settings.
             m_state = collectTimingsAndSettings(line);
             break;
 
         case CueText:
             // 41-53 - Collect the cue text, create a cue, and add it to the output.
-            m_state = collectCueText(line, position >= textData.length());
+            m_state = collectCueText(line);
             break;
 
         case BadCue:
             // 54-62 - Collect and discard the remaining cue.
             m_state = ignoreBadCue(line);
             break;
         }
     }
 }
 
+void WebVTTParser::flushPendingCue()
+{
+    // If we're in the CueText state when we run out of data, we emit the pending cue.
+    if (m_state == CueText)
+        createNewCue();
+}
+
 bool WebVTTParser::hasRequiredFileIdentifier(const String& line)
 {
     // A WebVTT file identifier consists of an optional BOM character,
     // the string "WEBVTT" followed by an optional space or tab character,
     // and any number of characters that are not line terminators ...
     if (!line.startsWith("WEBVTT", fileIdentifierLength))
         return false;
     if (line.length() > fileIdentifierLength && !isASpace(line[fileIdentifierLength]))
         return false;
 
@@ skipping 59 matching lines @@
     m_currentEndTime = collectTimeStamp(line, &position);
     if (m_currentEndTime == malformedTime)
         return BadCue;
     skipWhiteSpace(line, &position);
 
     // 12 - Parse the WebVTT settings for the cue (conducted in TextTrackCue).
     m_currentSettings = line.substring(position, line.length()-1);
     return CueText;
 }
 
-WebVTTParser::ParseState WebVTTParser::collectCueText(const String& line, bool isAtEnd)
+WebVTTParser::ParseState WebVTTParser::collectCueText(const String& line)
 {
     if (line.isEmpty()) {
         createNewCue();
         return Id;
     }
     if (!m_currentContent.isEmpty())
         m_currentContent.append("\n");
     m_currentContent.append(line);
 
-    if (isAtEnd)
-        createNewCue();
-
     return CueText;
 }
 
 WebVTTParser::ParseState WebVTTParser::ignoreBadCue(const String& line)
 {
     if (!line.isEmpty())
         return BadCue;
     return Id;
 }
 
@@ skipping 259 matching lines @@
     unsigned oldPosition = *position;
     while (*position < data.length() && data[*position] != '\r' && data[*position] != '\n')
         (*position)++;
     String line = data.substring(oldPosition, *position - oldPosition);
     skipLineTerminator(data, position);
     return line;
 }
 
 }