Media Remoting: Add interstitial elements to media element shadow dom.

third_party/WebKit/Source/core/layout/LayoutMedia.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple 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
@@ skipping 41 matching lines @@
   LayoutRect newRect = contentBoxRect();
 
   LayoutState state(*this);
 
 // Iterate the children in reverse order so that the media controls are laid
 // out before the text track container. This is to ensure that the text
 // track rendering has an up-to-date position of the media controls for
 // overlap checking, see LayoutVTTCue.
 #if DCHECK_IS_ON()
   bool seenTextTrackContainer = false;
+  bool seenMediaRemotingInterstitial = false;
 #endif
   for (LayoutObject* child = m_children.lastChild(); child;
        child = child->previousSibling()) {
 #if DCHECK_IS_ON()
-    if (child->node()->isMediaControls())
-      ASSERT(!seenTextTrackContainer);
-    else if (child->node()->isTextTrackContainer())
+    if (child->node()->isMediaControls()) {
+      DCHECK(!seenTextTrackContainer);
+    } else if (child->node()->isTextTrackContainer()) {
       seenTextTrackContainer = true;
-    else
+      DCHECK(!seenMediaRemotingInterstitial);
+    } else if (child->node()->isMediaRemotingInterstitial()) {
+      seenMediaRemotingInterstitial = true;
+    } else {
       NOTREACHED();
+    }
 #endif
 
     // TODO(mlamouri): we miss some layouts because needsLayout returns false in
     // some cases where we want to change the width of the controls because the
     // visible viewport has changed for example.
     if (newRect.size() == oldSize && !child->needsLayout())
       continue;
 
     LayoutUnit width = newRect.width();
-    if (child->node()->isMediaControls()) {
+    if (child->node()->isMediaControls() ||
+        child->node()->isMediaRemotingInterstitial()) {

[mlamouri (slow - plz ping), 2017/04/07 13:18:37]

I don't think you want this.

[xjz, 2017/04/07 23:07:01]

Done.

       width = computePanelWidth(newRect);
     }
 
     LayoutBox* layoutBox = toLayoutBox(child);
     layoutBox->setLocation(newRect.location());
     // TODO(foolip): Remove the mutableStyleRef() and depend on CSS
     // width/height: inherit to match the media element size.
     layoutBox->mutableStyleRef().setHeight(Length(newRect.height(), Fixed));
     layoutBox->mutableStyleRef().setWidth(Length(width, Fixed));
 
@@ skipping 19 matching lines @@
   // sets display: inline we would get an inline layoutObject as a child
   // of replaced content, which is not supposed to be possible. This
   // check can be removed if ::-webkit-media-controls is made
   // internal.
   if (child->node()->isMediaControls())
     return child->isFlexibleBox();
 
   if (child->node()->isTextTrackContainer())
     return true;
 
+  if (child->node()->isMediaRemotingInterstitial())
+    return true;

[mlamouri (slow - plz ping), 2017/04/07 13:18:37]

Can you merge this with the isTextTrackContainer() check above?

[xjz, 2017/04/07 23:07:01]

Done.

+
   return false;
 }
 
 void LayoutMedia::paintReplaced(const PaintInfo&, const LayoutPoint&) const {}
 
 LayoutUnit LayoutMedia::computePanelWidth(const LayoutRect& mediaRect) const {
   // TODO(mlamouri): we don't know if the main frame has an horizontal scrollbar
   // if it is out of process. See https://crbug.com/662480
   if (document().page()->mainFrame()->isRemoteFrame())
     return mediaRect.width();
@@ skipping 22 matching lines @@
           .x());
   const LayoutUnit newWidth = visibleWidth - absoluteXOffset;
 
   if (newWidth < 0)
     return mediaRect.width();
 
   return std::min(mediaRect.width(), visibleWidth - absoluteXOffset);
 }
 
 }  // namespace blink