Move VTT functionality from TextTrackCue.* to VTTCue.*

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 717 matching lines @@
     // 10. For each text track cue cue in cues that has not yet had
     // 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());
-        VTTRegion* region = 0;
-        if (cue->track()->regions())
-            region = cue->track()->regions()->getRegionById(cue->regionId());
+        if (cue->isVTTCue()) {

[acolwell GONE FROM CHROMIUM, 2013/11/20 18:38:45]

It feels like this logic should be inside VTTCue. Could we refactor this so the
code here would look something like

cue->display(m_videoDisplaySize.size(), this);

Then we theoretically wouldn't need to modify this code anymore for different
types of cues.

[gasubic, 2013/11/21 03:07:38]

Done

+            RefPtr<TextTrackCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size());
+            VTTRegion* region = 0;
+            if (cue->track()->regions()) {
+                VTTCue* vttCue = toVTTCue(cue);
+                region = cue->track()->regions()->getRegionById(vttCue->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() && !contains(displayBox.get()))
-                // Note: the display tree of a cue is removed when the active flag of the cue is unset.
-                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());
+            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() && !contains(displayBox.get())) {
+                    // Note: the display tree of a cue is removed when the active flag of the cue is unset.
+                    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 (!contains(regionNode.get()))
-                appendChild(regionNode);
+                // Append the region to the viewport, if it was not already.
+                if (!contains(regionNode.get()))
+                    appendChild(regionNode);
 
-            region->appendTextTrackCueBox(displayBox);
+                region->appendTextTrackCueBox(displayBox);
+            }
         }
     }
 
     // 11. Return output.
     if (hasChildNodes())
         show();
     else
         hide();
 }
 
@@ skipping 21 matching lines @@
     float fontSize = smallestDimension * 0.05f;
     if (fontSize != m_fontSize) {
         m_fontSize = fontSize;
         setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue::CSS_PX);
     }
 }
 
 // ----------------------------
 
 } // namespace WebCore