Add new helper VTTParser::collectDigitsToInt

Source/core/html/track/vtt/VTTCue.cpp

 /*
  * Copyright (c) 2013, Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 949 matching lines @@
 
             m_linePosition = number;
             }
             break;
         case Position:
             {
             // 1. If value contains any characters other than U+0025 PERCENT SIGN characters (%) and characters in the range
             //    U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9), then jump to the step labeled next setting.
             // 2. If value does not contain at least one character in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9),
             //    then jump to the step labeled next setting.
-            String textPosition = VTTParser::collectDigits(input, &position);
-            if (textPosition.isEmpty())
+            int number;
+            if (!VTTParser::collectDigitsToInt(input, &position, number))
                 break;
             if (position >= input.length())
                 break;
 
             // 3. If any character in value other than the last character is a U+0025 PERCENT SIGN character (%), then jump
             //    to the step labeled next setting.
             // 4. If the last character in value is not a U+0025 PERCENT SIGN character (%), then jump to the step labeled
             //    next setting.
             if (input[position++] != '%')
                 break;
             if (position < input.length() && !VTTParser::isValidSettingDelimiter(input[position]))
                 break;
 
             // 5. Ignoring the trailing percent sign, interpret value as an integer, and let number be that number.
             // 6. If number is not in the range 0 ≤ number ≤ 100, then jump to the step labeled next setting.
             // NOTE: toInt ignores trailing non-digit characters, such as '%'.
-            bool validNumber;
-            int number = textPosition.toInt(&validNumber);
-            if (!validNumber)
-                break;
             if (number < 0 || number > 100)
                 break;
 
             // 7. Let cue's text track cue text position be number.
             m_textPosition = number;
             }
             break;
         case Size:
             {
             // 1. If value contains any characters other than U+0025 PERCENT SIGN characters (%) and characters in the
             //    range U+0030 DIGIT ZERO (0) to U+0039 DIGIT NINE (9), then jump to the step labeled next setting.
             // 2. If value does not contain at least one character in the range U+0030 DIGIT ZERO (0) to U+0039 DIGIT
             //    NINE (9), then jump to the step labeled next setting.
-            String cueSize = VTTParser::collectDigits(input, &position);
-            if (cueSize.isEmpty())
+            int number;
+            if (!VTTParser::collectDigitsToInt(input, &position, number))
                 break;
             if (position >= input.length())
                 break;
 
             // 3. If any character in value other than the last character is a U+0025 PERCENT SIGN character (%),
             //    then jump to the step labeled next setting.
             // 4. If the last character in value is not a U+0025 PERCENT SIGN character (%), then jump to the step
             //    labeled next setting.
             if (input[position++] != '%')
                 break;
             if (position < input.length() && !VTTParser::isValidSettingDelimiter(input[position]))
                 break;
 
             // 5. Ignoring the trailing percent sign, interpret value as an integer, and let number be that number.
             // 6. If number is not in the range 0 ≤ number ≤ 100, then jump to the step labeled next setting.
-            bool validNumber;
-            int number = cueSize.toInt(&validNumber);
-            if (!validNumber)
-                break;
             if (number < 0 || number > 100)
                 break;
 
             // 7. Let cue's text track cue size be number.
             m_cueSize = number;
             }
             break;
         case Align:
             {
             String cueAlignment = VTTParser::collectWord(input, &position);
@@ skipping 74 matching lines @@
     return m_cueBackgroundBox->executionContext();
 }
 
 Document& VTTCue::document() const
 {
     ASSERT(m_cueBackgroundBox);
     return m_cueBackgroundBox->document();
 }
 
 } // namespace WebCore