Ideas for text track container follow-up

Source/core/html/track/TextTrackContainer.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 37 matching lines @@
     RefPtrWillBeRawPtr<TextTrackContainer> element = adoptRefWillBeNoop(new TextTrackContainer(document));
     element->setShadowPseudoId(AtomicString("-webkit-media-text-track-container", AtomicString::ConstructFromLiteral));
     return element.release();
 }
 
 LayoutObject* TextTrackContainer::createRenderer(const LayoutStyle&)
 {
     return new LayoutTextTrackContainer(this);
 }
 
-void TextTrackContainer::updateDisplay(HTMLMediaElement& mediaElement)
+void TextTrackContainer::updateDisplay(HTMLVideoElement& video)
 {
-    if (!mediaElement.closedCaptionsVisible()) {
+    if (!video.closedCaptionsVisible()) {
         removeChildren();
         return;
     }
 
     // 1. If the media element is an audio element, or is another playback
     // mechanism with no rendering area, abort these steps. There is nothing to
     // render.
-    if (isHTMLAudioElement(mediaElement))
-        return;
 
     // 2. Let video be the media element or other playback mechanism.
-    HTMLVideoElement& video = toHTMLVideoElement(mediaElement);
 
     // 3. Let output be an empty list of absolutely positioned CSS block boxes.
 
     // 4. If the user agent is exposing a user interface for video, add to
     // output one or more completely transparent positioned CSS block boxes that
     // cover the same region as the user interface.
 
     // 5. If the last time these rules were run, the user agent was not exposing
     // a user interface for video, but now it is, let reset be true. Otherwise,
     // let reset be false.
@@ skipping 28 matching lines @@
         ASSERT(cue->isActive());
         if (!cue->track() || !cue->track()->isRendered() || !cue->isActive())
             continue;
 
         cue->updateDisplay(*this);
     }
 
     // 11. Return output.
 }
 
-void TextTrackContainer::updateSizes(HTMLMediaElement& mediaElement)
+void TextTrackContainer::updateSizes(const LayoutSize& videoSize)
 {
-    if (!document().isActive())
-        return;
-
-    if (!mediaElement.renderer() || !mediaElement.renderer()->isVideo())
-        return;
-
     // FIXME: The video size is used to calculate the font size (a workaround
     // for lack of per-spec vh/vw support) but the whole media element is used
     // for cue rendering. This is inconsistent. See also the somewhat related
     // spec bug: https://www.w3.org/Bugs/Public/show_bug.cgi?id=28105
-    IntSize videoSize = toLayoutVideo(mediaElement.renderer())->videoBox().size();
 
     if (m_videoSize == videoSize)
         return;
     m_videoSize = videoSize;
 
-    float smallestDimension = std::min(m_videoSize.height(), m_videoSize.width());
+    float smallestDimension = std::min(m_videoSize.height().toFloat(), m_videoSize.width().toFloat());
 
     float fontSize = smallestDimension * 0.05f;
     if (fontSize != m_fontSize) {
         m_fontSize = fontSize;
         setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue::CSS_PX);
     }
 }
 
 } // namespace blink