Start separating 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/layout/LayoutView.h"
+#include "core/html/HTMLMediaElement.h"
+#include "core/html/track/TextTrackContainer.h"
 
 namespace blink {
 
-LayoutTextTrackContainerElement::LayoutTextTrackContainerElement(Element* element)
+LayoutTextTrackContainer::LayoutTextTrackContainer(Element* element)
     : LayoutBlockFlow(element)
 {
 }
 
-void LayoutTextTrackContainerElement::layout()
+void LayoutTextTrackContainer::layout()
 {
     LayoutBlockFlow::layout();
     if (style()->display() == NONE)
         return;
 
-    ASSERT(mediaControlElementType(node()) == MediaTextTrackDisplayContainer);
-
     DeprecatedScheduleStyleRecalcDuringLayout marker(node()->document().lifecycle());
 
-    static_cast<MediaControlTextTrackContainerElement*>(node())->updateSizes();
+    TextTrackContainer* textTrackContainer = toTextTrackContainer(node());
+    ASSERT(textTrackContainer);
+    // Overlay enclosure -> Media controls -> Media element
+    LayoutObject* mediaElementLayoutObject = parent()->parent()->parent();

[fs, 2015/03/06 17:50:03]

Had to get a bit "creative" here...

[philipj_slow, 2015/03/06 18:12:27]

Uh, yeah :)

+    textTrackContainer->updateSizes(mediaElementLayoutObject);
 }
 
 } // namespace blink