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

Source/core/html/track/TextTrackRegion.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 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (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"
-
-#if ENABLE(WEBVTT_REGIONS)
-
 #include "core/html/track/TextTrackRegion.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/DOMTokenList.h"
 #include "core/html/HTMLDivElement.h"
 #include "core/html/track/WebVTTParser.h"
 #include "platform/Logging.h"
 #include "core/rendering/RenderInline.h"
@@ skipping 306 matching lines @@
 {
     DEFINE_STATIC_LOCAL(const AtomicString, trackRegionShadowPseudoId,
         ("-webkit-media-text-track-region", AtomicString::ConstructFromLiteral));
 
     return trackRegionShadowPseudoId;
 }
 
 PassRefPtr<HTMLDivElement> TextTrackRegion::getDisplayTree()
 {
     if (!m_regionDisplayTree) {
-        m_regionDisplayTree = HTMLDivElement::create(ownerDocument());
+        m_regionDisplayTree = HTMLDivElement::create(*ownerDocument());
         prepareRegionDisplayTree();
     }
 
     return m_regionDisplayTree;
 }
 
 void TextTrackRegion::willRemoveTextTrackCueBox(TextTrackCueBox* box)
 {
     LOG(Media, "TextTrackRegion::willRemoveTextTrackCueBox");
     ASSERT(m_cueContainer->contains(box));
 
     double boxHeight = box->getBoundingClientRect()->bottom() - box->getBoundingClientRect()->top();
     float regionBottom = m_regionDisplayTree->getBoundingClientRect()->bottom();
 
     m_cueContainer->classList()->remove(textTrackCueContainerScrollingClass(), ASSERT_NO_EXCEPTION);
 
     m_currentTop += boxHeight;
     m_cueContainer->setInlineStyleProperty(CSSPropertyTop, m_currentTop, CSSPrimitiveValue::CSS_PX);
 }
 
 
 void TextTrackRegion::appendTextTrackCueBox(PassRefPtr<TextTrackCueBox> displayBox)
 {
+    ASSERT(m_cueContainer);
+
     if (m_cueContainer->contains(displayBox.get()))
         return;
 
     m_cueContainer->appendChild(displayBox);
     displayLastTextTrackCueBox();
 }
 
 void TextTrackRegion::displayLastTextTrackCueBox()
 {
     LOG(Media, "TextTrackRegion::displayLastTextTrackCueBox");
     ASSERT(m_cueContainer);
 
     // FIXME: This should not be causing recalc styles in a loop to set the "top" css
     // property to move elements. We should just scroll the text track cues on the
     // compositor with an animation.
 
-    if (!m_scrollTimer.isActive())
+    if (m_scrollTimer.isActive())
         return;
 
     // If it's a scrolling region, add the scrolling class.
     if (isScrollingRegion())
         m_cueContainer->classList()->add(textTrackCueContainerScrollingClass(), ASSERT_NO_EXCEPTION);
 
     float regionBottom = m_regionDisplayTree->getBoundingClientRect()->bottom();
 
     // Find first cue that is not entirely displayed and scroll it upwards.
-    for (int i = 0; i < m_cueContainer->childNodeCount() && !m_scrollTimer.isActive(); ++i) {
+    for (size_t i = 0; i < m_cueContainer->childNodeCount() && !m_scrollTimer.isActive(); ++i) {
         float childTop = toHTMLDivElement(m_cueContainer->childNode(i))->getBoundingClientRect()->top();
         float childBottom = toHTMLDivElement(m_cueContainer->childNode(i))->getBoundingClientRect()->bottom();
 
         if (regionBottom >= childBottom)
             continue;
 
         float height = childBottom - childTop;
 
         m_currentTop -= std::min(height, childBottom - regionBottom);
         m_cueContainer->setInlineStyleProperty(CSSPropertyTop, m_currentTop, CSSPrimitiveValue::CSS_PX);
@@ skipping 37 matching lines @@
     // anchor. Let topOffset be regionAnchorY multiplied by height divided by
     // 100.0. Let top be topOffset subtracted from 'viewportAnchorY vh'.
     double topOffset = m_regionAnchor.y() * height / 100;
     m_regionDisplayTree->setInlineStyleProperty(CSSPropertyTop,
         m_viewportAnchor.y() - topOffset,
         CSSPrimitiveValue::CSS_PERCENTAGE);
 
 
     // The cue container is used to wrap the cues and it is the object which is
     // gradually scrolled out as multiple cues are appended to the region.
-    m_cueContainer = HTMLDivElement::create(ownerDocument());
+    m_cueContainer = HTMLDivElement::create(*ownerDocument());
     m_cueContainer->setInlineStyleProperty(CSSPropertyTop,
         0.0,
         CSSPrimitiveValue::CSS_PX);
 
     m_cueContainer->setPart(textTrackCueContainerShadowPseudoId());
     m_regionDisplayTree->appendChild(m_cueContainer);
 
     // 7.5 Every WebVTT region object is initialised with the following CSS
     m_regionDisplayTree->setPart(textTrackRegionShadowPseudoId());
 }
@@ skipping 19 matching lines @@
 
 void TextTrackRegion::scrollTimerFired(Timer<TextTrackRegion>*)
 {
     LOG(Media, "TextTrackRegion::scrollTimerFired");
 
     stopTimer();
     displayLastTextTrackCueBox();
 }
 
 } // namespace WebCore
-
-#endif