Make VTTParser::collectDigitsToInt non-copying

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 28 matching lines @@
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 const double secondsPerHour = 3600;
 const double secondsPerMinute = 60;
 const double secondsPerMillisecond = 0.001;
 const double malformedTime = -1;
 const unsigned fileIdentifierLength = 6;
 
-String VTTParser::collectDigits(const String& input, unsigned* position)
+static unsigned scanDigits(const String& input, unsigned* position)
 {
-    StringBuilder digits;
+    unsigned startPosition = *position;
     while (*position < input.length() && isASCIIDigit(input[*position]))
-        digits.append(input[(*position)++]);
-    return digits.toString();
+        (*position)++;
+    return *position - startPosition;
 }
 
 unsigned VTTParser::collectDigitsToInt(const String& input, unsigned* position, int& number)
 {
-    String digits = collectDigits(input, position);
+    unsigned startPosition = *position;
+    unsigned numDigits = scanDigits(input, position);
+    if (!numDigits) {
+        number = 0;
+        return 0;
+    }
     bool validNumber;
-    number = digits.toInt(&validNumber);
-    // Since we know that |digits| only contain valid (ASCII) digits
-    // (disregarding the 'empty' case), the remaining failure mode for toInt()
-    // is overflow, so if |validNumber| is not true, then set |number| to the
-    // maximum int value.
-    if (!digits.isEmpty() && !validNumber)
+    if (input.is8Bit())
+        number = charactersToInt(input.characters8() + startPosition, numDigits, &validNumber);
+    else
+        number = charactersToInt(input.characters16() + startPosition, numDigits, &validNumber);
+
+    // Since we know that scanDigits only scanned valid (ASCII) digits (and
+    // hence that's what got passed to charactersToInt()), the remaining
+    // failure mode for charactersToInt() is overflow, so if |validNumber| is
+    // not true, then set |number| to the maximum int value.
+    if (!validNumber)
         number = std::numeric_limits<int>::max();
-    return digits.length();
+    return numDigits;
 }
 
 String VTTParser::collectWord(const String& input, unsigned* position)
 {
     StringBuilder string;
     while (*position < input.length() && !isASpace(input[*position]))
         string.append(input[(*position)++]);
     return string.toString();
 }
 
 void VTTParser::skipWhiteSpace(const String& line, unsigned* position)
 {
     while (*position < line.length() && isASpace(line[*position]))
         (*position)++;
 }
 
 float VTTParser::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;
-
-    StringBuilder floatNumberAsString;
-    floatNumberAsString.append(VTTParser::collectDigits(value, &position));
-
+    unsigned digitsBeforeDot = scanDigits(value, &position);
+    unsigned digitsAfterDot;

[Mike West, 2013/12/04 08:17:43]

If you default this to 0, you can drop the 'else' clause in the following 'if'.

     if (value[position] == '.') {
-        floatNumberAsString.append(".");
         position++;
 
-        floatNumberAsString.append(VTTParser::collectDigits(value, &position));
+        digitsAfterDot = scanDigits(value, &position);
+    } else {
+        digitsAfterDot = 0;
     }
-    float number = floatNumberAsString.toString().toFloat(&isValidSetting);
 
-    if (isValidSetting && (number <= 0 || number >= 100))
+    // At least one digit required.
+    if (!digitsBeforeDot && !digitsAfterDot) {
         isValidSetting = false;
+        return 0;
+    }
 
+    float number = value.toFloat();
+    isValidSetting = number >= 0 && number <= 100;
     return number;
 }
 
 FloatPoint VTTParser::parseFloatPercentageValuePair(const String& value, char delimiter, bool& isValidSetting)
 {
     // The delimiter can't be the first or second value because a pair of
     // percentages (x%,y%) implies that at least the first two characters
     // are the first percentage value.
     size_t delimiterOffset = value.find(delimiter, 2);
     if (delimiterOffset == kNotFound || delimiterOffset == value.length() - 1) {
@@ skipping 497 matching lines @@
             m_currentNode->parserAppendChild(ProcessingInstruction::create(document, "timestamp", charactersString));
         break;
     }
     default:
         break;
     }
 }
 
 }