Enable WebVTT regions for runtime testing, updated tests and minor fixes

Source/core/html/track/WebVTTParser.h

 /*
  * 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebVTTParser_h
 #define WebVTTParser_h
 
 #include "HTMLNames.h"
+#include "RuntimeEnabledFeatures.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/html/track/TextTrackCue.h"
 #include "core/html/track/TextTrackRegion.h"
 #include "core/html/track/WebVTTTokenizer.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 class Document;
 
 class WebVTTParserClient {
 public:
     virtual ~WebVTTParserClient() { }
 
     virtual void newCuesParsed() = 0;
-#if ENABLE(WEBVTT_REGIONS)
     virtual void newRegionsParsed() = 0;
-#endif
     virtual void fileFailedToParse() = 0;
 };
 
 class WebVTTParser {
 public:
     virtual ~WebVTTParser() { }
 
     enum ParseState {
         Initial,
         Header,
-#if ENABLE(WEBVTT_REGIONS)
-        Metadata,
-#endif
         Id,
         TimingsAndSettings,
         CueText,
         BadCue
     };
 
     static PassOwnPtr<WebVTTParser> create(WebVTTParserClient* client, ExecutionContext* context)
     {
         return adoptPtr(new WebVTTParser(client, context));
     }
@@ skipping 14 matching lines @@
     }
     static inline bool isValidSettingDelimiter(char c)
     {
         // ... a WebVTT cue consists of zero or more of the following components, in any order, separated from each other by one or more
         // U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters.
         return c == ' ' || c == '\t';
     }
     static String collectDigits(const String&, unsigned*);
     static String collectWord(const String&, unsigned*);
 
-#if ENABLE(WEBVTT_REGIONS)
     // Useful functions for parsing percentage settings.
     static float parseFloatPercentageValue(const String&, bool&);
     static FloatPoint parseFloatPercentageValuePair(const String&, char, bool&);
-#endif
 
     // Input data to the parser to parse.
     void parseBytes(const char* data, unsigned length);
 
     // Transfers ownership of last parsed cues to caller.
     void getNewCues(Vector<RefPtr<TextTrackCue> >&);
-#if ENABLE(WEBVTT_REGIONS)
     void getNewRegions(Vector<RefPtr<TextTrackRegion> >&);
-#endif
 
     PassRefPtr<DocumentFragment> createDocumentFragmentFromCueText(const String&);
     double collectTimeStamp(const String&, unsigned*);
 
 protected:
     WebVTTParser(WebVTTParserClient*, ExecutionContext*);
 
     ExecutionContext* m_executionContext;
     ParseState m_state;
 
 private:
     bool hasRequiredFileIdentifier();
     ParseState collectCueId(const String&);
     ParseState collectTimingsAndSettings(const String&);
     ParseState collectCueText(const String&, unsigned length, unsigned);
     ParseState ignoreBadCue(const String&);
 
     void createNewCue();
     void resetCueValues();
 
-#if ENABLE(WEBVTT_REGIONS)
-    void collectHeader(const String&);
+    void collectMetadataHeader(const String&);
     void createNewRegion();
-#endif
 
     void skipWhiteSpace(const String&, unsigned*);
     static void skipLineTerminator(const char* data, unsigned length, unsigned*);
     static String collectNextLine(const char* data, unsigned length, unsigned*);
 
     void constructTreeFromToken(Document&);
 
     String m_currentHeaderName;
     String m_currentHeaderValue;
 
     Vector<char> m_identifierData;
     String m_currentId;
     double m_currentStartTime;
     double m_currentEndTime;
     StringBuilder m_currentContent;
     String m_currentSettings;
 
     WebVTTToken m_token;
     OwnPtr<WebVTTTokenizer> m_tokenizer;
 
     RefPtr<ContainerNode> m_currentNode;
 
     WebVTTParserClient* m_client;
 
     Vector<AtomicString> m_languageStack;
     Vector<RefPtr<TextTrackCue> > m_cuelist;
 
-#if ENABLE(WEBVTT_REGIONS)
     Vector<RefPtr<TextTrackRegion> > m_regionList;
-#endif
 };
 
 } // namespace WebCore
 
 #endif