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

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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
@@ skipping 599 matching lines @@
       if (mediaControls())
         mediaControls()->onControlsListUpdated();
     }
   } else if (name == preloadAttr) {
     setPlayerPreload();
   } else if (name == disableremoteplaybackAttr) {
     // This attribute is an extension described in the Remote Playback API spec.
     // Please see: https://w3c.github.io/remote-playback
     UseCounter::count(document(), UseCounter::DisableRemotePlaybackAttribute);
     if (params.oldValue != params.newValue) {
-      if (m_webMediaPlayer) {
+      // Don't inform |m_webMediaPlayer| this change if Media Remoting is
+      // explicitly disabled by user.
+      if (m_webMediaPlayer && !isMediaRemotingDisabled()) {

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

Instead of leaking the media remoting logic into HTMLMediaElement, could the
media remoting logic be adapted to handle this?

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

Done. Removed the check. Yes, this is already handled by the media remoting
control logic.

         m_webMediaPlayer->requestRemotePlaybackDisabled(
             !params.newValue.isNull());
       }
       // TODO(mlamouri): there is no direct API to expose if
       // disableRemotePLayback attribute has changed. It will require a direct
       // access to MediaControls for the moment.
       if (mediaControls())
         mediaControls()->onDisableRemotePlaybackAttributeChanged();
     }
   } else {
@@ skipping 2924 matching lines @@
       return true;
   }
 
   return false;
 }
 
 bool HTMLMediaElement::textTracksVisible() const {
   return m_textTracksVisible;
 }
 
-static void assertShadowRootChildren(ShadowRoot& shadowRoot) {
+// static
+void HTMLMediaElement::assertShadowRootChildren(ShadowRoot& shadowRoot) {
 #if DCHECK_IS_ON()
-  // There can be up to two children, either or both of the text
-  // track container and media controls. If both are present, the
-  // text track container must be the first child.
+  // There can be up to three children: media remoting interstitial, text track
+  // container, media controls. The mediaControls has to be the last child if
+  // present, and has to be the next sibling of the text track container if both
+  // present.
   unsigned numberOfChildren = shadowRoot.countChildren();
-  DCHECK_LE(numberOfChildren, 2u);
+  DCHECK_LE(numberOfChildren, 3u);
   Node* firstChild = shadowRoot.firstChild();
   Node* lastChild = shadowRoot.lastChild();
   if (numberOfChildren == 1) {
-    DCHECK(firstChild->isTextTrackContainer() || firstChild->isMediaControls());
+    DCHECK(firstChild->isTextTrackContainer() ||
+           firstChild->isMediaControls() ||
+           firstChild->isMediaRemotingInterstitial());
   } else if (numberOfChildren == 2) {
-    DCHECK(firstChild->isTextTrackContainer());
+    DCHECK(firstChild->isTextTrackContainer() ||
+           firstChild->isMediaRemotingInterstitial());
+    DCHECK(lastChild->isTextTrackContainer() || lastChild->isMediaControls());
+    if (firstChild->isTextTrackContainer())
+      DCHECK(lastChild->isMediaControls());
+  } else if (numberOfChildren == 3) {
+    Node* secondChild = firstChild->nextSibling();
+    DCHECK(firstChild->isMediaRemotingInterstitial());
+    DCHECK(secondChild->isTextTrackContainer());
     DCHECK(lastChild->isMediaControls());
   }
 #endif
 }
 
 TextTrackContainer& HTMLMediaElement::ensureTextTrackContainer() {
   ShadowRoot& shadowRoot = ensureUserAgentShadowRoot();
   assertShadowRootChildren(shadowRoot);
 
   Node* firstChild = shadowRoot.firstChild();
   if (firstChild && firstChild->isTextTrackContainer())
     return toTextTrackContainer(*firstChild);
+  Node* toBeInsertedBefore = firstChild;
+
+  if (firstChild->isMediaRemotingInterstitial()) {
+    Node* secondChild = firstChild->nextSibling();
+    if (secondChild && secondChild->isTextTrackContainer())
+      return toTextTrackContainer(*secondChild);
+    toBeInsertedBefore = secondChild;
+  }
 
   TextTrackContainer* textTrackContainer =
       TextTrackContainer::create(document());
 
   // The text track container should be inserted before the media controls,
   // so that they are rendered behind them.
-  shadowRoot.insertBefore(textTrackContainer, firstChild);
+  shadowRoot.insertBefore(textTrackContainer, toBeInsertedBefore);
 
   assertShadowRootChildren(shadowRoot);
 
   return *textTrackContainer;
 }
 
 void HTMLMediaElement::updateTextTrackDisplay() {
   BLINK_MEDIA_LOG << "updateTextTrackDisplay(" << (void*)this << ")";
 
   ensureTextTrackContainer().updateDisplay(
@@ skipping 585 matching lines @@
       kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE);
 }
 
 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) {
   m_mostlyFillingViewport = true;
   if (m_webMediaPlayer)
     m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport);
 }
 
 }  // namespace blink