Remove TextTrackCueBox

Source/core/html/track/vtt/VTTCue.cpp

 /*
  * Copyright (c) 2013, Opera Software ASA. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 106 matching lines @@
 {
     if (TextTrackCue::isInfiniteOrNonNumber(value, method, exceptionState))
         return true;
     if (value < 0 || value > 100) {
         exceptionState.throwDOMException(IndexSizeError, ExceptionMessages::failedToSet(method, "TextTrackCue", "The value provided (" + String::number(value) + ") is not between 0 and 100."));
         return true;
     }
     return false;
 }
 
-// ----------------------------
+static const AtomicString& textTrackCueBoxShadowPseudoId()
+{
+    DEFINE_STATIC_LOCAL(const AtomicString, trackDisplayBoxShadowPseudoId, ("-webkit-media-text-track-display", AtomicString::ConstructFromLiteral));

[acolwell GONE FROM CHROMIUM, 2013/12/03 20:51:31]

nit: Any reason not to just move this into the constuctor since that appears to
be the only reference.

[philipj_slow, 2013/12/03 21:16:23]

I imagined it might be some deliberate style. I've grepped a bit and inlined it
in the same way as in most other setPseudo call sites.

+    return trackDisplayBoxShadowPseudoId;
+}
 
 VTTCueBox::VTTCueBox(Document& document, VTTCue* cue)
-    : TextTrackCueBox(document)
+    : HTMLDivElement(document)
     , m_cue(cue)
 {
     setPseudo(textTrackCueBoxShadowPseudoId());
 }
 
 void VTTCueBox::applyCSSProperties(const IntSize&)
 {
     // FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
     if (!m_cue->regionId().isEmpty()) {
         setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
@@ skipping 53 matching lines @@
 
         setInlineStyleProperty(CSSPropertyWhiteSpace, CSSValuePre);
     }
 }
 
 RenderObject* VTTCueBox::createRenderer(RenderStyle*)
 {
     return new RenderVTTCue(this);
 }
 
-// ----------------------------
-
 VTTCue::VTTCue(Document& document, double startTime, double endTime, const String& text)
     : TextTrackCue(startTime, endTime)
     , m_text(text)
     , m_linePosition(undefinedPosition)
     , m_computedLinePosition(undefinedPosition)
     , m_textPosition(50)
     , m_cueSize(100)
     , m_writingDirection(Horizontal)
     , m_cueAlignment(Middle)
     , m_vttNodeTree(0)
@@ skipping 489 matching lines @@
 
     // Clear the contents of the set.
     m_cueBackgroundBox->removeChildren();
 
     // Update the two sets containing past and future WebVTT objects.
     RefPtr<DocumentFragment> referenceTree = createCueRenderingTree();
     markFutureAndPastNodes(referenceTree.get(), startTime(), movieTime);
     m_cueBackgroundBox->appendChild(referenceTree, ASSERT_NO_EXCEPTION);
 }
 
-PassRefPtr<TextTrackCueBox> VTTCue::getDisplayTree(const IntSize& videoSize)
+PassRefPtr<VTTCueBox> VTTCue::getDisplayTree(const IntSize& videoSize)
 {
     RefPtr<VTTCueBox> displayTree = displayTreeInternal();
     if (!m_displayTreeShouldChange || !track()->isRendered())
         return displayTree;
 
     // 10.1 - 10.10
     calculateDisplayParameters();
 
     // 10.11. Apply the terms of the CSS specifications to nodes within the
     // following constraints, thus obtaining a set of CSS boxes positioned
@@ skipping 29 matching lines @@
     // boxes.
     return displayTree;
 }
 
 void VTTCue::removeDisplayTree()
 {
     if (m_notifyRegion && track()->regions()) {
         // The region needs to be informed about the cue removal.
         VTTRegion* region = track()->regions()->getRegionById(m_regionId);
         if (region)
-            region->willRemoveTextTrackCueBox(m_displayTree.get());
+            region->willRemoveVTTCueBox(m_displayTree.get());
     }
 
     displayTreeInternal()->remove(ASSERT_NO_EXCEPTION);
 }
 
 void VTTCue::updateDisplay(const IntSize& videoSize, HTMLDivElement& container)
 {
-    RefPtr<TextTrackCueBox> displayBox = getDisplayTree(videoSize);
+    RefPtr<VTTCueBox> displayBox = getDisplayTree(videoSize);
     VTTRegion* region = 0;
     if (track()->regions())
         region = track()->regions()->getRegionById(regionId());
 
     if (!region) {
         // 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:
         if (displayBox->hasChildNodes() && !container.contains(displayBox.get())) {
             // Note: the display tree of a cue is removed when the active flag of the cue is unset.
             container.appendChild(displayBox);
         }
     } else {
         // Let region be the WebVTT region whose region identifier
         // matches the text track cue region identifier of cue.
         RefPtr<HTMLDivElement> regionNode = region->getDisplayTree(document());
 
         // Append the region to the viewport, if it was not already.
         if (!container.contains(regionNode.get()))
             container.appendChild(regionNode);
 
-        region->appendTextTrackCueBox(displayBox);
+        region->appendVTTCueBox(displayBox);
     }
 }
 
 std::pair<double, double> VTTCue::getPositionCoordinates() const
 {
     // This method is used for setting x and y when snap to lines is not set.
     std::pair<double, double> coordinates;
 
     if (m_writingDirection == Horizontal && m_displayDirection == CSSValueLtr) {
         coordinates.first = m_textPosition;
@@ skipping 304 matching lines @@
     return m_cueBackgroundBox->executionContext();
 }
 
 Document& VTTCue::document() const
 {
     ASSERT(m_cueBackgroundBox);
     return m_cueBackgroundBox->document();
 }
 
 } // namespace WebCore