Enable WebVTT regions for runtime testing, updated tests and minor fixes

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 44 matching lines @@
 }
 
 String WebVTTParser::collectWord(const String& input, unsigned* position)
 {
     StringBuilder string;
     while (*position < input.length() && !isASpace(input[*position]))
         string.append(input[(*position)++]);
     return string.toString();
 }
 
-#if ENABLE(WEBVTT_REGIONS)
 float WebVTTParser::parseFloatPercentageValue(const String& value, bool& isValidSetting)
 {
     // '%' must be present and at the end of the setting value.
     if (value.find('%', 1) != value.length() - 1) {
         isValidSetting = false;
         return 0;
     }
 
     unsigned position = 0;
 
@@ skipping 27 matching lines @@
 
     bool isFirstValueValid;
     float firstCoord = parseFloatPercentageValue(value.substring(0, delimiterOffset), isFirstValueValid);
 
     bool isSecondValueValid;
     float secondCoord = parseFloatPercentageValue(value.substring(delimiterOffset + 1, value.length() - 1), isSecondValueValid);
 
     isValidSetting = isFirstValueValid && isSecondValueValid;
     return FloatPoint(firstCoord, secondCoord);
 }
-#endif
 
 WebVTTParser::WebVTTParser(WebVTTParserClient* client, ScriptExecutionContext* context)
     : m_scriptExecutionContext(context)
     , m_state(Initial)
     , m_currentStartTime(0)
     , m_currentEndTime(0)
     , m_tokenizer(WebVTTTokenizer::create())
     , m_client(client)
 {
 }
 
 void WebVTTParser::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues)
 {
     outputCues = m_cuelist;
     m_cuelist.clear();
 }
 
-#if ENABLE(WEBVTT_REGIONS)
 void WebVTTParser::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegions)
 {
     outputRegions = m_regionList;
     m_regionList.clear();
 }
-#endif
 
 void WebVTTParser::parseBytes(const char* data, unsigned length)
 {
     // 4.8.10.13.3 WHATWG WebVTT Parser algorithm.
     // 1-3 - Initial setup.
     unsigned position = 0;
 
     while (position < length) {
         String line = collectNextLine(data, length, &position);
 
@@ skipping 10 matching lines @@
                     m_client->fileFailedToParse();
                 return;
             }
 
             m_state = Header;
             m_identifierData.clear();
             break;
 
         case Header:
             // 13-18 - Allow a header (comment area) under the WEBVTT line.
-#if ENABLE(WEBVTT_REGIONS)
             if (line.isEmpty()) {
-                if (m_client && m_regionList.size())
+                if (RuntimeEnabledFeatures::webVTTRegionsEnabled() && m_client && m_regionList.size())

[acolwell GONE FROM CHROMIUM, 2013/10/04 19:48:20]

nit: Can m_regionList.size() be > 0 if the flag is not set? If not then please
remove flag check.

[vcarbune.chromium, 2013/10/08 18:07:38]

Done.

                     m_client->newRegionsParsed();
 
                 m_state = Id;
                 break;
             }
-            collectHeader(line);
+            if (RuntimeEnabledFeatures::webVTTRegionsEnabled())

[acolwell GONE FROM CHROMIUM, 2013/10/04 19:48:20]

nit: Do you really need a flag check here? It seems like you should transition
to Metadata instead of Header if the flag isn't set instead of doing multiple
checks here. In fact I don't see any code that causes m_state transition to
Metadata.

[vcarbune.chromium, 2013/10/08 18:07:38]

I moved the flag check and inside the function and renamed it to
collectMetadataHeader to match the spec ("Metadata header loop"). I removed the
Metadata state, because it's not needed.

On the other hand, I think these steps need a spec re-sync (filed
http://crbug.com/305317)

+                collectHeader(line);
 
             break;
 
         case Metadata:
-#endif
             if (line.isEmpty())
                 m_state = Id;
             break;
 
         case Id:
             // 19-29 - Allow any number of line terminators, then initialize new cue values.
             if (line.isEmpty())
                 break;
             resetCueValues();
 
@@ skipping 32 matching lines @@
     if (line.length() < fileIdentifierLength)
         return false;
     if (line.substring(0, fileIdentifierLength) != "WEBVTT")
         return false;
     if (line.length() > fileIdentifierLength && line[fileIdentifierLength] != ' ' && line[fileIdentifierLength] != '\t')
         return false;
 
     return true;
 }
 
-#if ENABLE(WEBVTT_REGIONS)
 void WebVTTParser::collectHeader(const String& line)
 {
     // 4.1 Extension of WebVTT header parsing (11 - 15)
     DEFINE_STATIC_LOCAL(const AtomicString, regionHeaderName, ("Region", AtomicString::ConstructFromLiteral));
 
     // 15.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.
     if (!line.contains(":"))
         return;
 
     unsigned colonPosition = line.find(":");
     m_currentHeaderName = line.substring(0, colonPosition);
 
     // 15.5 If metadata's name equals "Region":
     if (m_currentHeaderName == regionHeaderName) {
         m_currentHeaderValue = line.substring(colonPosition + 1, line.length() - 1);
         // 15.5.1 - 15.5.8 Region creation: Let region be a new text track region [...]
         createNewRegion();
     }
 }
-#endif
 
 WebVTTParser::ParseState WebVTTParser::collectCueId(const String& line)
 {
     if (line.contains("-->"))
         return collectTimingsAndSettings(line);
     m_currentId = line;
     return TimingsAndSettings;
 }
 
 WebVTTParser::ParseState WebVTTParser::collectTimingsAndSettings(const String& line)
@@ skipping 100 matching lines @@
 
 void WebVTTParser::resetCueValues()
 {
     m_currentId = emptyString();
     m_currentSettings = emptyString();
     m_currentStartTime = 0;
     m_currentEndTime = 0;
     m_currentContent.clear();
 }
 
-#if ENABLE(WEBVTT_REGIONS)
 void WebVTTParser::createNewRegion()
 {
     if (!m_currentHeaderValue.length())
         return;
 
     RefPtr<TextTrackRegion> region = TextTrackRegion::create(m_scriptExecutionContext);
     region->setRegionSettings(m_currentHeaderValue);
 
     // 15.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;
         }
 
     m_regionList.append(region);
 }
-#endif
 
 double WebVTTParser::collectTimeStamp(const String& line, unsigned* position)
 {
     // 4.8.10.13.3 Collect a WebVTT timestamp.
     // 1-4 - Initial checks, let most significant units be minutes.
     enum Mode { minutes, hours };
     Mode mode = minutes;
     if (*position >= line.length() || !isASCIIDigit(line[*position]))
         return malformedTime;
 
@@ skipping 159 matching lines @@
     unsigned oldPosition = *position;
     while (*position < length && data[*position] != '\r' && data[*position] != '\n')
         (*position)++;
     String line = String::fromUTF8(data + oldPosition, *position - oldPosition);
     skipLineTerminator(data, length, position);
     return line;
 }
 
 }