Separate the text track container from the media controls

Source/core/layout/LayoutTextTrackContainer.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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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