| Index: Source/core/html/track/vtt/VTTRegion.cpp
|
| diff --git a/Source/core/html/track/vtt/VTTRegion.cpp b/Source/core/html/track/vtt/VTTRegion.cpp
|
| index f049721d16908642a21157905b7eb73a405e63d7..718874c34e6cd548cd1afd11cbdbce13054fbcac 100644
|
| --- a/Source/core/html/track/vtt/VTTRegion.cpp
|
| +++ b/Source/core/html/track/vtt/VTTRegion.cpp
|
| @@ -337,9 +337,9 @@ PassRefPtr<HTMLDivElement> VTTRegion::getDisplayTree(Document& document)
|
| 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();
|
| @@ -350,8 +350,7 @@ void VTTRegion::willRemoveTextTrackCueBox(TextTrackCueBox* box)
|
| m_cueContainer->setInlineStyleProperty(CSSPropertyTop, m_currentTop, CSSPrimitiveValue::CSS_PX);
|
| }
|
|
|
| -
|
| -void VTTRegion::appendTextTrackCueBox(PassRefPtr<TextTrackCueBox> displayBox)
|
| +void VTTRegion::appendVTTCueBox(PassRefPtr<VTTCueBox> displayBox)
|
| {
|
| ASSERT(m_cueContainer);
|
|
|
| @@ -359,12 +358,12 @@ void VTTRegion::appendTextTrackCueBox(PassRefPtr<TextTrackCueBox> displayBox)
|
| 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
|
| @@ -436,7 +435,6 @@ void VTTRegion::prepareRegionDisplayTree()
|
| 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());
|
| @@ -475,7 +473,7 @@ void VTTRegion::scrollTimerFired(Timer<VTTRegion>*)
|
| WTF_LOG(Media, "VTTRegion::scrollTimerFired");
|
|
|
| stopTimer();
|
| - displayLastTextTrackCueBox();
|
| + displayLastVTTCueBox();
|
| }
|
|
|
| } // namespace WebCore
|
|
|