Remove TextTrack.regions and VTTRegionList

third_party/WebKit/Source/core/html/track/vtt/VTTParser.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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/html/track/vtt/VTTParser.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ProcessingInstruction.h"
 #include "core/dom/Text.h"
 #include "core/html/track/vtt/VTTElement.h"
+#include "core/html/track/vtt/VTTRegion.h"
 #include "core/html/track/vtt/VTTScanner.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/text/SegmentedString.h"
 #include "wtf/text/CharacterNames.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 40 matching lines @@
       m_decoder(TextResourceDecoder::create("text/plain", UTF8Encoding())),
       m_currentStartTime(0),
       m_currentEndTime(0),
       m_client(client) {}
 
 void VTTParser::getNewCues(HeapVector<Member<TextTrackCue>>& outputCues) {
   DCHECK(outputCues.isEmpty());
   outputCues.swap(m_cueList);
 }
 
-void VTTParser::getNewRegions(HeapVector<Member<VTTRegion>>& outputRegions) {
-  DCHECK(outputRegions.isEmpty());
-  outputRegions.swap(m_regionList);
-}
-
 void VTTParser::parseBytes(const char* data, size_t length) {
   String textData = m_decoder->decode(data, length);
   m_lineReader.append(textData);
   parse();
 }
 
 void VTTParser::flush() {
   String textData = m_decoder->flush();
   m_lineReader.append(textData);
   m_lineReader.setEndOfStream();
@@ skipping 18 matching lines @@
         }
 
         m_state = Header;
         break;
 
       case Header:
         // Steps 10 - 14 - Allow a header (comment area) under the WEBVTT line.
         collectMetadataHeader(line);
 
         if (line.isEmpty()) {
-          if (m_client && m_regionList.size())
-            m_client->newRegionsParsed();
-
           m_state = Id;
           break;
         }
 
         // Step 15 - Break out of header loop if the line could be a timestamp
         // line.
         if (line.contains("-->"))
           m_state = recoverCue(line);
 
         // Step 16 - Line is not the empty string and does not contain "-->".
@@ skipping 61 matching lines @@
     // to check for LF here.
     if (maybeSeparator != spaceCharacter &&
         maybeSeparator != tabulationCharacter)
       return false;
   }
   return true;
 }
 
 void VTTParser::collectMetadataHeader(const String& line) {
   // WebVTT header parsing (WebVTT parser algorithm step 12)
-  DEFINE_STATIC_LOCAL(const AtomicString, regionHeaderName, ("Region"));
 
   // The only currently supported header is the "Region" header.
   if (!RuntimeEnabledFeatures::webVTTRegionsEnabled())
     return;
 
   // Step 12.4 If line contains the character ":" (A U+003A COLON), then set
   // metadata's name to the substring of line before the first ":" character and
   // metadata's value to the substring after this character.
   size_t colonPosition = line.find(':');
   if (colonPosition == kNotFound)
     return;
 
   String headerName = line.substring(0, colonPosition);
 
   // Steps 12.5 If metadata's name equals "Region":
-  if (headerName == regionHeaderName) {
+  if (headerName == "Region") {

[foolip, 2017/02/10 23:31:56]

Yeah, that was odd before :)

     String headerValue = line.substring(colonPosition + 1);
     // Steps 12.5.1 - 12.5.11 Region creation: Let region be a new text track
     // region [...]
     createNewRegion(headerValue);
   }
 }
 
 VTTParser::ParseState VTTParser::collectCueId(const String& line) {
   if (line.contains("-->"))
     return collectTimingsAndSettings(line);
@@ skipping 142 matching lines @@
 }
 
 void VTTParser::createNewRegion(const String& headerValue) {
   if (headerValue.isEmpty())
     return;
 
   // Steps 12.5.1 - 12.5.9 - Construct and initialize a WebVTT Region object.
   VTTRegion* region = VTTRegion::create();
   region->setRegionSettings(headerValue);
 
-  // Step 12.5.10 If the text track list of regions regions contains a region
-  // with the same region identifier value as region, remove that region.
-  for (size_t i = 0; i < m_regionList.size(); ++i) {
-    if (m_regionList[i]->id() == region->id()) {
-      m_regionList.remove(i);
-      break;
-    }
-  }
-
-  // Step 12.5.11
-  m_regionList.push_back(region);
-
   if (region->id().isEmpty())
     return;
   m_regionMap.set(region->id(), region);
 }
 
 bool VTTParser::collectTimeStamp(const String& line, double& timeStamp) {
   VTTScanner input(line);
   return collectTimeStamp(input, timeStamp);
 }
 
@@ skipping 151 matching lines @@
     default:
       break;
   }
 }
 
 DEFINE_TRACE(VTTParser) {
   visitor->trace(m_document);
   visitor->trace(m_client);
   visitor->trace(m_cueList);
   visitor->trace(m_regionMap);
-  visitor->trace(m_regionList);
 }
 
 }  // namespace blink