Pass a VTTScanner to VTTRegion::parseSettingValue

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 195 matching lines @@
         // 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);
+        parseSettingValue(name, input);
     }
 }
 
 VTTRegion::RegionSetting VTTRegion::scanSettingName(VTTScanner& input)
 {
     if (input.scan("id"))
         return Id;
     if (input.scan("height"))
         return Height;
     if (input.scan("width"))
         return Width;
     if (input.scan("viewportanchor"))
         return ViewportAnchor;
     if (input.scan("regionanchor"))
         return RegionAnchor;
     if (input.scan("scroll"))
         return Scroll;
 
     return None;
 }
 
-void VTTRegion::parseSettingValue(RegionSetting setting, const String& value)
+void VTTRegion::parseSettingValue(RegionSetting setting, VTTScanner& input)
 {
     DEFINE_STATIC_LOCAL(const AtomicString, scrollUpValueKeyword, ("up", AtomicString::ConstructFromLiteral));
 
+    VTTScanner::Run valueRun = input.collectUntil<VTTParser::isASpace>();
+
     switch (setting) {
-    case Id:
-        if (value.find("-->") == kNotFound)
-            m_id = value;
+    case Id: {
+        String stringValue = input.extractString(valueRun);
+        if (stringValue.find("-->") == kNotFound)
+            m_id = stringValue;
         break;
+    }
     case Width: {
         float floatWidth;
-        VTTScanner valueScanner(value);
-        if (VTTParser::parseFloatPercentageValue(valueScanner, floatWidth) && valueScanner.isAtEnd())
+        if (VTTParser::parseFloatPercentageValue(input, floatWidth) && input.isAt(valueRun.end()))

[Mike West, 2014/01/22 10:24:26]

Nit: `input.isAt(valueRun.end())` is awkward. You're checking that the whole run
was used, right? Perhaps `parsedEntireRun(VTTScanner::Run)` or something
similar?

[fs, 2014/01/22 10:29:50]

You mean as a local helper? Or on VTTScanner? (I think I'd prefer the former -
at least in that form.)

             m_width = floatWidth;
         else
             WTF_LOG(Media, "VTTRegion::parseSettingValue, invalid Width");
         break;
     }
     case Height: {
         int number;
-        VTTScanner valueScanner(value);
-        if (valueScanner.scanDigits(number) && valueScanner.isAtEnd())
+        if (input.scanDigits(number) && input.isAt(valueRun.end()))
             m_heightInLines = number;
         else
             WTF_LOG(Media, "VTTRegion::parseSettingValue, invalid Height");
         break;
     }
     case RegionAnchor: {
-        VTTScanner valueScanner(value);
         FloatPoint anchor;
-        if (VTTParser::parseFloatPercentageValuePair(valueScanner, ',', anchor) && valueScanner.isAtEnd())
+        if (VTTParser::parseFloatPercentageValuePair(input, ',', anchor) && input.isAt(valueRun.end()))
             m_regionAnchor = anchor;
         else
             WTF_LOG(Media, "VTTRegion::parseSettingValue, invalid RegionAnchor");
         break;
     }
     case ViewportAnchor: {
-        VTTScanner valueScanner(value);
         FloatPoint anchor;
-        if (VTTParser::parseFloatPercentageValuePair(valueScanner, ',', anchor) && valueScanner.isAtEnd())
+        if (VTTParser::parseFloatPercentageValuePair(input, ',', anchor) && input.isAt(valueRun.end()))
             m_viewportAnchor = anchor;
         else
             WTF_LOG(Media, "VTTRegion::parseSettingValue, invalid ViewportAnchor");
         break;
     }
     case Scroll:
-        if (value == scrollUpValueKeyword)
+        if (input.scanRun(valueRun, scrollUpValueKeyword))
             m_scroll = true;
         else
             WTF_LOG(Media, "VTTRegion::parseSettingValue, invalid Scroll");
         break;
     case None:
         break;
     }
+
+    input.skipRun(valueRun);
 }
 
 const AtomicString& VTTRegion::textTrackCueContainerShadowPseudoId()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, trackRegionCueContainerPseudoId,
         ("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral));
 
     return trackRegionCueContainerPseudoId;
 }
 
@@ skipping 156 matching lines @@
 
 void VTTRegion::scrollTimerFired(Timer<VTTRegion>*)
 {
     WTF_LOG(Media, "VTTRegion::scrollTimerFired");
 
     stopTimer();
     displayLastVTTCueBox();
 }
 
 } // namespace WebCore