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

Source/core/html/track/TextTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2011, 2012, 2013 Apple 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.
@@ skipping 14 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * 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.
  */
 
 #include "config.h"
 #include "core/html/track/TextTrack.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/track/TextTrackCueList.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/html/track/TextTrackRegion.h"
 #include "core/html/track/TextTrackRegionList.h"
 
 namespace WebCore {
 
@@ skipping 43 matching lines @@
 
 const AtomicString& TextTrack::showingKeyword()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, ended, ("showing", AtomicString::ConstructFromLiteral));
     return ended;
 }
 
 TextTrack::TextTrack(ScriptExecutionContext* context, TextTrackClient* client, const AtomicString& kind, const AtomicString& label, const AtomicString& language, TextTrackType type)
     : TrackBase(context, TrackBase::TextTrack)
     , m_cues(0)
-#if ENABLE(WEBVTT_REGIONS)
     , m_regions(0)
-#endif
     , m_mediaElement(0)
     , m_label(label)
     , m_language(language)
     , m_mode(disabledKeyword().string())
     , m_client(client)
     , m_trackType(type)
     , m_readinessState(NotLoaded)
     , m_trackIndex(invalidTrackIndex)
     , m_renderedTrackIndex(invalidTrackIndex)
     , m_hasBeenConfigured(false)
 {
     ScriptWrappable::init(this);
     setKind(kind);
 }
 
 TextTrack::~TextTrack()
 {
     if (m_cues) {
         if (m_client)
             m_client->textTrackRemoveCues(this, m_cues.get());
 
         for (size_t i = 0; i < m_cues->length(); ++i)
             m_cues->item(i)->setTrack(0);
     }
 
-#if ENABLE(WEBVTT_REGIONS)
-    if (m_regions) {
+    if (RuntimeEnabledFeatures::webVTTRegionsEnabled() && m_regions) {

[acolwell GONE FROM CHROMIUM, 2013/10/04 19:48:20]

nit: Why is this covered by the feature guard. Will regions ever have a length >
0 if the flag isn't enabled? If so then why is running this loop bad in that
case?

[vcarbune.chromium, 2013/10/08 18:07:38]

Removed the runtime flag check. It should be zero if it isn't enabled.

         for (size_t i = 0; i < m_regions->length(); ++i)
             m_regions->item(i)->setTrack(0);
     }
-#endif
     clearClient();
 }
 
 bool TextTrack::isValidKindKeyword(const AtomicString& value)
 {
     if (value == subtitlesKeyword())
         return true;
     if (value == captionsKeyword())
         return true;
     if (value == descriptionsKeyword())
@@ skipping 132 matching lines @@
     if (!m_cues || !m_cues->remove(cue)) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     cue->setTrack(0);
     if (m_client)
         m_client->textTrackRemoveCue(this, cue);
 }
 
-#if ENABLE(WEBVTT_REGIONS)
 TextTrackRegionList* TextTrack::regionList()
 {
     return ensureTextTrackRegionList();
 }
 
 TextTrackRegionList* TextTrack::ensureTextTrackRegionList()
 {
     if (!m_regions)
         m_regions = TextTrackRegionList::create();
 
     return m_regions.get();
 }
 
 TextTrackRegionList* TextTrack::regions()
 {
     // If the text track mode of the text track that the TextTrack object
     // represents is not the text track disabled mode, then the regions
     // attribute must return a live TextTrackRegionList object that represents
     // the text track list of regions of the text track. Otherwise, it must
     // return null. When an object is returned, the same object must be returned
     // each time.
     if (m_mode != disabledKeyword())
         return ensureTextTrackRegionList();
-
     return 0;
 }
 
 void TextTrack::addRegion(PassRefPtr<TextTrackRegion> prpRegion)
 {
     if (!prpRegion)
         return;
 
     RefPtr<TextTrackRegion> region = prpRegion;
     TextTrackRegionList* regionList = ensureTextTrackRegionList();
@@ skipping 32 matching lines @@
         return;
     }
 
     if (!m_regions || !m_regions->remove(region)) {
         es.throwUninformativeAndGenericDOMException(InvalidStateError);
         return;
     }
 
     region->setTrack(0);
 }
-#endif
 
 void TextTrack::cueWillChange(TextTrackCue* cue)
 {
     if (!m_client)
         return;
 
     // The cue may need to be repositioned in the media element's interval tree, may need to
     // be re-rendered, etc, so remove it before the modification...
     m_client->textTrackRemoveCue(this, cue);
 }
@@ skipping 117 matching lines @@
 {
     // "Main program" content is intrinsic to the presentation of the media file, regardless of locale. Content such as
     // directors commentary is not "main program" because it is not essential for the presentation. HTML5 doesn't have
     // a way to express this in a machine-reable form, it is typically done with the track label, so we assume that caption
     // tracks are main content and all other track types are not.
     return m_kind == captionsKeyword();
 }
 
 } // namespace WebCore