Remove TextTrackCueBox

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 319 matching lines @@
 PassRefPtr<HTMLDivElement> VTTRegion::getDisplayTree(Document& document)
 {
     if (!m_regionDisplayTree) {
         m_regionDisplayTree = HTMLDivElement::create(document);
         prepareRegionDisplayTree();
     }
 
     return m_regionDisplayTree;
 }
 
-void VTTRegion::willRemoveTextTrackCueBox(TextTrackCueBox* box)
+void VTTRegion::willRemoveVTTCueBox(VTTCueBox* box)
 {
-    WTF_LOG(Media, "VTTRegion::willRemoveTextTrackCueBox");
+    WTF_LOG(Media, "VTTRegion::willRemoveVTTCueBox");
     ASSERT(m_cueContainer->contains(box));
 
     double boxHeight = box->getBoundingClientRect()->bottom() - box->getBoundingClientRect()->top();
 
     m_cueContainer->classList()->remove(textTrackCueContainerScrollingClass(), ASSERT_NO_EXCEPTION);
 
     m_currentTop += boxHeight;
     m_cueContainer->setInlineStyleProperty(CSSPropertyTop, m_currentTop, CSSPrimitiveValue::CSS_PX);
 }
 
-
-void VTTRegion::appendTextTrackCueBox(PassRefPtr<TextTrackCueBox> displayBox)
+void VTTRegion::appendVTTCueBox(PassRefPtr<VTTCueBox> displayBox)
 {
     ASSERT(m_cueContainer);
 
     if (m_cueContainer->contains(displayBox.get()))
         return;
 
     m_cueContainer->appendChild(displayBox);
-    displayLastTextTrackCueBox();
+    displayLastVTTCueBox();
 }
 
-void VTTRegion::displayLastTextTrackCueBox()
+void VTTRegion::displayLastVTTCueBox()
 {
-    WTF_LOG(Media, "VTTRegion::displayLastTextTrackCueBox");
+    WTF_LOG(Media, "VTTRegion::displayLastVTTCueBox");
     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())
         return;
 
     // If it's a scrolling region, add the scrolling class.
@@ skipping 51 matching lines @@
 
     // Let viewportAnchorY be the y dimension of the text track region viewport
     // anchor and regionAnchorY be the y dimension of the text track region
     // 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(m_regionDisplayTree->document());
     m_cueContainer->setInlineStyleProperty(CSSPropertyTop,
         0.0,
         CSSPrimitiveValue::CSS_PX);
 
     m_cueContainer->setPseudo(textTrackCueContainerShadowPseudoId());
     m_regionDisplayTree->appendChild(m_cueContainer);
 
@@ skipping 18 matching lines @@
 
     if (m_scrollTimer.isActive())
         m_scrollTimer.stop();
 }
 
 void VTTRegion::scrollTimerFired(Timer<VTTRegion>*)
 {
     WTF_LOG(Media, "VTTRegion::scrollTimerFired");
 
     stopTimer();
-    displayLastTextTrackCueBox();
+    displayLastVTTCueBox();
 }
 
 } // namespace WebCore