Rework end-of-value field handling in VTTRegion::parseSettingValue

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 30 matching lines @@
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 const double secondsPerHour = 3600;
 const double secondsPerMinute = 60;
 const double secondsPerMillisecond = 0.001;
 const unsigned fileIdentifierLength = 6;
 
-unsigned VTTParser::collectDigitsToInt(const String& input, unsigned* position, int& number)
-{
-    VTTLegacyScanner inputScanner(input, position);
-    return inputScanner.scanDigits(number);
-}
-
 bool VTTParser::parseFloatPercentageValue(VTTScanner& valueScanner, float& percentage)
 {
     float number;
     if (!valueScanner.scanFloat(number))
         return false;
     // '%' must be present and at the end of the setting value.
     if (!valueScanner.scan('%'))
         return false;
     if (number < 0 || number > 100)
         return false;
     percentage = number;
     return true;
 }
 
-bool VTTParser::parseFloatPercentageValuePair(const String& value, char delimiter, FloatPoint& valuePair)
+bool VTTParser::parseFloatPercentageValuePair(VTTScanner& valueScanner, char delimiter, FloatPoint& valuePair)
 {
-    VTTScanner valueScanner(value);
-
     float firstCoord;
     if (!parseFloatPercentageValue(valueScanner, firstCoord))
         return false;
 
     if (!valueScanner.scan(delimiter))
         return false;
 
     float secondCoord;
     if (!parseFloatPercentageValue(valueScanner, secondCoord))
         return false;
 
-    if (!valueScanner.isAtEnd())
-        return false;
-
     valuePair = FloatPoint(firstCoord, secondCoord);
     return true;
 }
 
 VTTParser::VTTParser(VTTParserClient* client, Document& document)
     : m_document(&document)
     , m_state(Initial)
     , m_decoder(TextResourceDecoder::create("text/plain", UTF8Encoding()))
     , m_currentStartTime(0)
     , m_currentEndTime(0)
@@ skipping 464 matching lines @@
             m_currentNode->parserAppendChild(ProcessingInstruction::create(document, "timestamp", charactersString));
         break;
     }
     default:
         break;
     }
 }
 
 }