Separate the text track container from the media controls

Source/core/layout/LayoutTextTrackContainer.cpp

Index: Source/core/layout/LayoutTextTrackContainer.cpp
diff --git a/Source/core/layout/LayoutTextTrackContainerElement.cpp b/Source/core/layout/LayoutTextTrackContainer.cpp
similarity index 82%
rename from Source/core/layout/LayoutTextTrackContainerElement.cpp
rename to Source/core/layout/LayoutTextTrackContainer.cpp
index 428a26f7ea6ca415e414d021ddf14fc09856544c..c32badd36f76a75bb750f880479bfeed7d67a603 100644
--- a/Source/core/layout/LayoutTextTrackContainerElement.cpp
+++ b/Source/core/layout/LayoutTextTrackContainer.cpp
@@ -27,29 +27,32 @@
 
 #include "config.h"
 
-#include "core/layout/LayoutTextTrackContainerElement.h"
+#include "core/layout/LayoutTextTrackContainer.h"
 
 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"
+#include "core/html/shadow/MediaControlElementTypes.h"

[philipj_slow, 2015/02/26 09:51:52]

OK, this is ugly. Should I replace this with a simple node()->shadowHost()
maybe?

[fs, 2015/02/26 12:30:52]

I get the feeling that could just use the layout tree here instead? (Combined
with my suggestion in TextTrackContainer::updateDisplay I don't think you'd need
to access HTMLMediaElement at all?)

[rune, 2015/02/26 13:17:15]

I don't understand this comment about an include file.

[philipj_slow, 2015/02/27 07:13:52]

Do you mean the CueDisplayContext idea? Yeah, whatever the details, it seems
like layout could be made unaware of HTMLMediaElement. For now Ill use the
layout tree to get to it instead.

 #include "core/layout/LayoutView.h"
 
 namespace blink {
 
-LayoutTextTrackContainerElement::LayoutTextTrackContainerElement(Element* element)
+LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element)
     : RenderBlockFlow(element)
 {
 }
 
-void LayoutTextTrackContainerElement::layout()
+void LayoutTextTrackContainer::layout()
 {
     RenderBlockFlow::layout();
     if (style()->display() == NONE)

[philipj_slow, 2015/02/26 09:51:52]

Rune, is this even possible? I thought that LayoutObjects wouldn't even be
created if display is none.

[rune, 2015/02/26 13:17:15]

This shouldn't happen as long as the renderer is created through the
RenderTreeBuilder. It will fail the rendererIsNeeded() check when display is
'none' afaict.

Have you tried to git-blame this check?

         return;
 
-    ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer);
+    HTMLMediaElement* mediaElement = toParentMediaElement(node());
+    if (!mediaElement)
+        return;
 
     DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycle());
 
-    static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();
+    toTextTrackContainer(node())->updateSizes(*mediaElement);
 }
 
 } // namespace blink