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

Source/core/html/shadow/MediaControlElements.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 12 matching lines @@
  * (INCLUDING, BUT NOT 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/shadow/MediaControlElements.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/DOMTokenList.h"
 #include "core/events/EventNames.h"
 #include "core/dom/FullscreenElementStack.h"
 #include "core/events/MouseEvent.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/shadow/MediaControls.h"
 #include "core/html/track/TextTrack.h"
 #include "core/html/track/TextTrackRegionList.h"
 #include "core/page/EventHandler.h"
@@ skipping 687 matching lines @@
     // corresponding CSS boxes added to output, in text track cue order, run the
     // following substeps:
     for (size_t i = 0; i < activeCues.size(); ++i) {
         TextTrackCue* cue = activeCues[i].data();
 
         ASSERT(cue->isActive());
         if (!cue->track() || !cue->track()->isRendered() || !cue->isActive())
             continue;
 
         RefPtr<TextTrackCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size());
+        TextTrackRegion* region = 0;
+        if (RuntimeEnabledFeatures::webVTTRegionsEnabled() && cue->track()->regions())
+            region = cue->track()->regions()->getRegionById(cue->regionId());
 
-#if ENABLE(WEBVTT_REGIONS)
-        String regionId = cue->regionId();
-        TextTrackRegion* region = cue->track()->regions()->getRegionById(regionId);
-        if (!region) {
+        if (!RuntimeEnabledFeatures::webVTTRegionsEnabled() || !region) {

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

nit: Isn't the !RuntimeEnabledFeatures::webVTTRegionsEnabled() check redundant
here? If it isn't set !region will always be true.

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

Correct, I removed it from here and the line above, but added it in an the upper
level of TextTrack::regions().

             // If cue has an empty text track cue region identifier or there is no
             // WebVTT region whose region identifier is identical to cue's text
             // track cue region identifier, run the following substeps:
-#endif
-            if (displayBox->hasChildNodes() && !contains(displayBox.get())) {
+            if (displayBox->hasChildNodes() && !contains(displayBox.get()))
                 // Note: the display tree of a cue is removed when the active flag of the cue is unset.
                 appendChild(displayBox);
-            }
-#if ENABLE(WEBVTT_REGIONS)
         } else {
             // Let region be the WebVTT region whose region identifier
             // matches the text track cue region identifier of cue.
             RefPtr<HTMLDivElement> regionNode = region->getDisplayTree();
 
             // Append the region to the viewport, if it was not already.
             if (!contains(regionNode.get()))
                 appendChild(region->getDisplayTree());
 
             region->appendTextTrackCueBox(displayBox);
         }
-#endif
     }
 
     // 11. Return output.
     if (hasChildNodes())
         show();
     else
         hide();
 }
 
 void MediaControlTextTrackContainerElement::updateSizes(bool forceUpdate)
@@ skipping 26 matching lines @@
     CueList activeCues = mediaElement->currentlyActiveCues();
     for (size_t i = 0; i < activeCues.size(); ++i) {
         TextTrackCue* cue = activeCues[i].data();
         cue->videoSizeDidChange(m_videoDisplaySize.size());
     }
 }
 
 // ----------------------------
 
 } // namespace WebCore