Make VTTRegion::setRegionSettings use VTTScanner

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

 /*
  * Copyright (C) 2013 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 173 matching lines @@
 {
     m_heightInLines = region->height();
     m_width = region->width();
 
     m_regionAnchor = FloatPoint(region->regionAnchorX(), region->regionAnchorY());
     m_viewportAnchor = FloatPoint(region->viewportAnchorX(), region->viewportAnchorY());
 
     setScroll(region->scroll(), ASSERT_NO_EXCEPTION);
 }
 
-void VTTRegion::setRegionSettings(const String& input)
+void VTTRegion::setRegionSettings(const String& inputString)
 {
-    m_settings = input;
-    unsigned position = 0;
+    m_settings = inputString;
 
-    while (position < input.length()) {
-        while (position < input.length() && VTTParser::isValidSettingDelimiter(input[position]))
-            position++;
+    VTTScanner input(inputString);
 
-        if (position >= input.length())
+    while (!input.isAtEnd()) {
+        input.skipWhile<VTTParser::isValidSettingDelimiter>();
+
+        if (input.isAtEnd())
             break;
 
-        parseSetting(input, &position);
+        // Scan the name part.
+        RegionSetting name = scanSettingName(input);
+
+        // Verify that we're looking at a '='.
+        if (name == None || !input.scan('=')) {
+            input.skipUntil<VTTParser::isASpace>();
+            continue;
+        }
+
+        // Scan the value part.
+        VTTScanner::Run valueRun = input.collectUntil<VTTParser::isASpace>();
+        parseSettingValue(name, input.extractString(valueRun));
+        input.skipRun(valueRun);
     }
 }
 
 VTTRegion::RegionSetting VTTRegion::scanSettingName(VTTScanner& input)
 {
     if (input.scan("id"))
         return Id;
     if (input.scan("height"))
         return Height;
     if (input.scan("width"))
@@ skipping 46 matching lines @@
         if (value == scrollUpValueKeyword)
             m_scroll = true;
         else
             WTF_LOG(Media, "VTTRegion::parseSettingValue, invalid Scroll");
         break;
     case None:
         break;
     }
 }
 
-void VTTRegion::parseSetting(const String& inputString, unsigned* position)
-{
-    VTTLegacyScanner input(inputString, position);
-
-    // Scan the name part.
-    RegionSetting name = scanSettingName(input);
-
-    // Verify that we're looking at a '='.
-    if (!input.scan('=')) {
-        input.skipUntil<VTTParser::isASpace>();
-        return;
-    }
-
-    // Scan the value part.
-    VTTScanner::Run valueRun = input.collectUntil<VTTParser::isASpace>();
-    parseSettingValue(name, input.extractString(valueRun));
-    input.skipRun(valueRun);
-}
-
 const AtomicString& VTTRegion::textTrackCueContainerShadowPseudoId()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, trackRegionCueContainerPseudoId,
         ("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral));
 
     return trackRegionCueContainerPseudoId;
 }
 
 const AtomicString& VTTRegion::textTrackCueContainerScrollingClass()
 {
@@ skipping 154 matching lines @@
 
 void VTTRegion::scrollTimerFired(Timer<VTTRegion>*)
 {
     WTF_LOG(Media, "VTTRegion::scrollTimerFired");
 
     stopTimer();
     displayLastVTTCueBox();
 }
 
 } // namespace WebCore